[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-ot-layout.cc   |    2 +-
 src/hb-subset-glyf.cc |    8 ++++----
 src/hb-subset-plan.cc |    4 ++--
 src/hb-subset.cc      |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit cdab20df1e55da196ffc6bc00d580e5ef74c1975
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Feb 10 15:45:17 2018 -0600

    Minor

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index e93fc078..8ad36d22 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -1255,7 +1255,7 @@ void hb_ot_map_t::position (const hb_ot_shape_plan_t *plan, hb_font_t *font, hb_
   apply (proxy, plan, font, buffer);
 }
 
-HB_INTERNAL void
+void
 hb_ot_layout_substitute_lookup (OT::hb_ot_apply_context_t *c,
 				const OT::SubstLookup &lookup,
 				const hb_ot_layout_lookup_accelerator_t &accel)
commit 203b647530b1550388bb3ce2f67e3b17e019d3e4
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date:   Sun Feb 11 01:00:03 2018 +0330

    Favor use of static instead HB_INTERNAL

diff --git a/src/hb-subset-glyf.cc b/src/hb-subset-glyf.cc
index 31358e81..fd8f7de2 100644
--- a/src/hb-subset-glyf.cc
+++ b/src/hb-subset-glyf.cc
@@ -29,7 +29,7 @@
 #include "hb-set.h"
 #include "hb-subset-glyf.hh"
 
-HB_INTERNAL bool
+static bool
 _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
                                      hb_prealloced_array_t<unsigned int> &glyph_ids,
                                      bool *use_short_loca, /* OUT */
@@ -63,7 +63,7 @@ _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
   return true;
 }
 
-HB_INTERNAL void
+static void
 _write_loca_entry (unsigned int id, unsigned int offset, bool is_short, void *loca_prime) {
   if (is_short) {
     ((OT::HBUINT16*) loca_prime) [id].set (offset / 2);
@@ -72,7 +72,7 @@ _write_loca_entry (unsigned int id, unsigned int offset, bool is_short, void *lo
   }
 }
 
-HB_INTERNAL bool
+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,
@@ -109,7 +109,7 @@ _write_glyf_and_loca_prime (const OT::glyf::accelerator_t &glyf,
   return true;
 }
 
-HB_INTERNAL bool
+static bool
 _hb_subset_glyf_and_loca (const OT::glyf::accelerator_t  &glyf,
                           const char                     *glyf_data,
                           hb_prealloced_array_t<hb_codepoint_t>&glyphs_to_retain,
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index 830047f5..7f4448bf 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -53,7 +53,7 @@ hb_subset_plan_new_gid_for_old_id (hb_subset_plan_t *plan,
   return false;
 }
 
-HB_INTERNAL void
+static void
 _populate_codepoints (hb_set_t *input_codepoints,
                       hb_prealloced_array_t<hb_codepoint_t>& plan_codepoints)
 {
@@ -66,7 +66,7 @@ _populate_codepoints (hb_set_t *input_codepoints,
   plan_codepoints.qsort (_hb_codepoint_t_cmp);
 }
 
-HB_INTERNAL void
+static void
 _populate_gids_to_retain (hb_face_t *face,
                           hb_prealloced_array_t<hb_codepoint_t>& codepoints,
                           hb_prealloced_array_t<hb_codepoint_t>& old_gids,
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index 40f175d9..94600617 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -107,7 +107,7 @@ hb_subset_input_destroy(hb_subset_input_t *subset_input)
 }
 
 template<typename TableType>
-HB_INTERNAL hb_blob_t *
+static hb_blob_t *
 _subset (hb_subset_plan_t *plan, hb_face_t *source)
 {
     OT::Sanitizer<TableType> sanitizer;