From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 18 May 2011 02:40:40 +0000 (-0400)
Subject: [HB] Update to newer vertical API
X-Git-Tag: 1.31.0~19^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1bb3e428528b307a78ac24f518076c2c6fcf963a;p=platform%2Fupstream%2Fpango.git

[HB] Update to newer vertical API
---

diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index e44c6fe..1a5f4cb 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -130,11 +130,10 @@ pango_fc_hb_font_get_glyph (hb_font_t *font, void *font_data,
 }
 
 static hb_bool_t
-pango_fc_hb_font_get_contour_point (hb_font_t *font, void *font_data,
-				    hb_codepoint_t glyph, unsigned int point_index,
-				    hb_bool_t *vertical,
-				    hb_position_t *x, hb_position_t *y,
-				    void *user_data G_GNUC_UNUSED)
+pango_fc_hb_font_get_glyph_contour_point (hb_font_t *font, void *font_data,
+					  hb_codepoint_t glyph, unsigned int point_index,
+					  hb_position_t *x, hb_position_t *y,
+					  void *user_data G_GNUC_UNUSED)
 {
   return FALSE;
 #if 0
@@ -179,7 +178,6 @@ pango_fc_hb_font_get_glyph_h_advance (hb_font_t *font, void *font_data,
 static hb_bool_t
 pango_fc_hb_font_get_glyph_extents (hb_font_t *font,  void *font_data,
 				    hb_codepoint_t glyph,
-				    hb_bool_t *vertical,
 				    hb_glyph_extents_t *extents,
 				    void *user_data G_GNUC_UNUSED)
 {
@@ -224,10 +222,11 @@ pango_fc_get_hb_font_funcs (void)
   if (G_UNLIKELY (!funcs)) {
     funcs = hb_font_funcs_create ();
     hb_font_funcs_set_glyph_func (funcs, pango_fc_hb_font_get_glyph, NULL, NULL);
+    /* XXX vertical */
     hb_font_funcs_set_glyph_h_advance_func (funcs, pango_fc_hb_font_get_glyph_h_advance, NULL, NULL);
     hb_font_funcs_set_glyph_extents_func (funcs, pango_fc_hb_font_get_glyph_extents, NULL, NULL);
-    hb_font_funcs_set_contour_point_func (funcs, pango_fc_hb_font_get_contour_point, NULL, NULL);
-    hb_font_funcs_set_h_kerning_func (funcs, pango_fc_hb_font_get_h_kerning, NULL, NULL);
+    hb_font_funcs_set_glyph_contour_point_func (funcs, pango_fc_hb_font_get_glyph_contour_point, NULL, NULL);
+    hb_font_funcs_set_glyph_h_kerning_func (funcs, pango_fc_hb_font_get_h_kerning, NULL, NULL);
   }
 
   return funcs;