[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 test/api/test-shape.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eb2be97f864c726feaa2434e290f962ddfa97069
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Oct 9 07:48:52 2018 -0400

    Port test off deprecated API

diff --git a/test/api/test-shape.c b/test/api/test-shape.c
index 2a0024d0..146cf0f4 100644
--- a/test/api/test-shape.c
+++ b/test/api/test-shape.c
@@ -55,7 +55,7 @@ glyph_h_advance_func (hb_font_t *font HB_UNUSED, void *font_data HB_UNUSED,
 
 static hb_bool_t
 glyph_func (hb_font_t *font HB_UNUSED, void *font_data HB_UNUSED,
-	    hb_codepoint_t unicode, hb_codepoint_t variation_selector HB_UNUSED,
+	    hb_codepoint_t unicode,
 	    hb_codepoint_t *glyph,
 	    void *user_data HB_UNUSED)
 {
@@ -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, malloc (10), free);
+  hb_font_funcs_set_nominal_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);