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

[Behdad Esfahbod]

 src/hb-ot-layout.cc   |    2 ++
 test/api/test-shape.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 94dd0bb7e78125994cb7c833a5b03110f1ffc822
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Feb 25 11:31:03 2016 +0900

    Add blacklist signature for Times New Roman (Bold) Italic on OS X

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 2be4b20..1071d07 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -72,6 +72,8 @@ _hb_ot_layout_create (hb_face_t *face)
     if (0
       || (442 == gdef_len && 42038 == gpos_len && 2874 == gsub_len) /* Windows 7 timesi.ttf */
       || (430 == gdef_len && 40662 == gpos_len && 2874 == gsub_len) /* Windows 7 timesbi.ttf */
+      || (490 == gdef_len && 41638 == gpos_len && 3046 == gsub_len) /* OS X 10.11.3 Times New Roman Italic.ttf */
+      || (478 == gdef_len && 41902 == gpos_len && 3046 == gsub_len) /* OS X 10.11.3 Times New Roman Bold Italic.ttf */
     )
     {
       /* In certain versions of Times New Roman Italic and Bold Italic,
commit dd8598c1c7f29fc92253b0cd4e856c1941b1d0c0
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Feb 25 11:20:05 2016 +0900

    [test] Pass closure to hb_font_set_glyph_func()
    
    Exercises fix in c335fd7986fe360ab8e1c032c9b988d0d30511eb

diff --git a/test/api/test-shape.c b/test/api/test-shape.c
index eb24407..c274f0f 100644
--- a/test/api/test-shape.c
+++ b/test/api/test-shape.c
@@ -101,7 +101,7 @@ test_shape (void)
 
   ffuncs = hb_font_funcs_create ();
   hb_font_funcs_set_glyph_h_advance_func (ffuncs, glyph_h_advance_func, NULL, NULL);
-  hb_font_funcs_set_glyph_func (ffuncs, glyph_func, NULL, NULL);
+  hb_font_funcs_set_glyph_func (ffuncs, glyph_func, malloc (10), free);
   hb_font_funcs_set_glyph_h_kerning_func (ffuncs, glyph_h_kerning_func, NULL, NULL);
   hb_font_set_funcs (font, ffuncs, NULL, NULL);
   hb_font_funcs_destroy (ffuncs);