diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2011-05-25 11:40:28 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2011-05-25 11:40:28 -0400 |
| commit | 7f9f7184286d584398603e449271d8bbd0e2e101 (patch) | |
| tree | be121138d1629203ec0502383637d13f075ba539 /modules | |
| parent | 21ab90b29b7fb5f90bf2fd653f4a9b1a0f661a2a (diff) | |
| download | pango-7f9f7184286d584398603e449271d8bbd0e2e101.tar.gz | |
[HB] Final update for font-funcs API changes
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/basic/basic-fc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c index 31d8faa0..42832470 100644 --- a/modules/basic/basic-fc.c +++ b/modules/basic/basic-fc.c @@ -158,10 +158,9 @@ pango_fc_hb_font_get_glyph_contour_point (hb_font_t *font, void *font_data, #endif } -static void +static hb_position_t pango_fc_hb_font_get_glyph_h_advance (hb_font_t *font, void *font_data, hb_codepoint_t glyph, - hb_position_t *advance, void *user_data G_GNUC_UNUSED) { PangoFcHbContext *context = (PangoFcHbContext *) font_data; @@ -170,7 +169,7 @@ pango_fc_hb_font_get_glyph_h_advance (hb_font_t *font, void *font_data, pango_font_get_glyph_extents ((PangoFont *) fc_font, glyph, NULL, &logical); - *advance = logical.width; + return logical.width; } static hb_bool_t @@ -193,10 +192,9 @@ pango_fc_hb_font_get_glyph_extents (hb_font_t *font, void *font_data, return TRUE; } -static void +static hb_position_t pango_fc_hb_font_get_h_kerning (hb_font_t *font, void *font_data, hb_codepoint_t left_glyph, hb_codepoint_t right_glyph, - hb_position_t *kern, void *user_data G_GNUC_UNUSED) { PangoFcHbContext *context = (PangoFcHbContext *) font_data; @@ -204,9 +202,9 @@ pango_fc_hb_font_get_h_kerning (hb_font_t *font, void *font_data, FT_Vector kerning; if (FT_Get_Kerning (ft_face, left_glyph, right_glyph, FT_KERNING_DEFAULT, &kerning)) - return; + return 0; - *kern = PANGO_UNITS_26_6 (kerning.x); + return PANGO_UNITS_26_6 (kerning.x); } static hb_font_funcs_t * |