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

[Behdad Esfahbod]

 src/hb-buffer-private.hh                                |   20 ++++++++--------
 test/shaping/data/text-rendering-tests/Makefile.sources |    2 -
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 1eb98c9916c6cb447f999170840b7f37de4b282d
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jan 11 17:59:03 2018 +0100

    [test/text-rendering-tests] Actually disable MORX-11

diff --git a/test/shaping/data/text-rendering-tests/Makefile.sources b/test/shaping/data/text-rendering-tests/Makefile.sources
index 0c210fa8..e09091a6 100644
--- a/test/shaping/data/text-rendering-tests/Makefile.sources
+++ b/test/shaping/data/text-rendering-tests/Makefile.sources
@@ -28,7 +28,6 @@ TESTS = \
 	tests/HVAR-2.tests \
 	tests/KERN-1.tests \
 	tests/KERN-2.tests \
-	tests/MORX-11.tests \
 	tests/SHBALI-3.tests \
 	tests/SHKNDA-1.tests \
 	$(NULL)
@@ -36,6 +35,7 @@ TESTS = \
 DISBALED_TESTS = \
 	tests/CMAP-3.tests \
 	tests/MORX-10.tests \
+	tests/MORX-11.tests \
 	tests/MORX-1.tests \
 	tests/MORX-2.tests \
 	tests/MORX-3.tests \
commit 3f291ffd5a9480ac0f528eaedd43c7e9af738ee2
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jan 11 17:57:46 2018 +0100

    [buffer] Fix compiler warnings
    
    line 323: Warning: info hides hb_buffer_t::info
    ...

diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh
index fa5ca166..9148ef31 100644
--- a/src/hb-buffer-private.hh
+++ b/src/hb-buffer-private.hh
@@ -307,37 +307,37 @@ struct hb_buffer_t {
   HB_INTERNAL bool message_impl (hb_font_t *font, const char *fmt, va_list ap) HB_PRINTF_FUNC(3, 0);
 
   static inline void
-  set_cluster (hb_glyph_info_t &info, unsigned int cluster, unsigned int mask = 0)
+  set_cluster (hb_glyph_info_t &inf, unsigned int cluster, unsigned int mask = 0)
   {
-    if (info.cluster != cluster)
+    if (inf.cluster != cluster)
     {
       if (mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK)
-	info.mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
+	inf.mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
       else
-	info.mask &= ~HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
+	inf.mask &= ~HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
     }
-    info.cluster = cluster;
+    inf.cluster = cluster;
   }
 
   inline int
-  _unsafe_to_break_find_min_cluster (const hb_glyph_info_t *info,
+  _unsafe_to_break_find_min_cluster (const hb_glyph_info_t *infos,
 				     unsigned int start, unsigned int end,
 				     unsigned int cluster) const
   {
     for (unsigned int i = start; i < end; i++)
-      cluster = MIN<unsigned int> (cluster, info[i].cluster);
+      cluster = MIN<unsigned int> (cluster, infos[i].cluster);
     return cluster;
   }
   inline void
-  _unsafe_to_break_set_mask (hb_glyph_info_t *info,
+  _unsafe_to_break_set_mask (hb_glyph_info_t *infos,
 			     unsigned int start, unsigned int end,
 			     unsigned int cluster)
   {
     for (unsigned int i = start; i < end; i++)
-      if (cluster != info[i].cluster)
+      if (cluster != infos[i].cluster)
       {
 	scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_UNSAFE_TO_BREAK;
-	info[i].mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
+	infos[i].mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK;
       }
   }