[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-subset-glyf.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7039803b51f23cb15dd7e12b105c379bd2e38d71
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Feb 10 15:47:50 2018 -0600

    Fix djgpp bot

diff --git a/src/hb-subset-glyf.cc b/src/hb-subset-glyf.cc
index fd8f7de2..95294678 100644
--- a/src/hb-subset-glyf.cc
+++ b/src/hb-subset-glyf.cc
@@ -31,7 +31,7 @@
 
 static bool
 _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
-                                     hb_prealloced_array_t<unsigned int> &glyph_ids,
+                                     hb_prealloced_array_t<hb_codepoint_t> &glyph_ids,
                                      bool *use_short_loca, /* OUT */
                                      unsigned int *glyf_size, /* OUT */
                                      unsigned int *loca_size /* OUT */)
@@ -75,7 +75,7 @@ _write_loca_entry (unsigned int id, unsigned int offset, bool is_short, void *lo
 static bool
 _write_glyf_and_loca_prime (const OT::glyf::accelerator_t &glyf,
                             const char                    *glyf_data,
-                            hb_prealloced_array_t<unsigned int> &glyph_ids,
+                            hb_prealloced_array_t<hb_codepoint_t> &glyph_ids,
                             bool                           use_short_loca,
                             int                            glyf_prime_size,
                             char                          *glyf_prime_data /* OUT */,