diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2017-04-17 13:26:52 -0700 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2017-04-17 13:26:52 -0700 |
| commit | 906509e22bf617d97a71f41d335d7a0dec344187 (patch) | |
| tree | 77d366513a8158e5cef3e39744b8baa9baa32284 | |
| parent | 6c5d1d35061a91c3c0792f7720da3f8308ebff65 (diff) | |
| download | pango-906509e22bf617d97a71f41d335d7a0dec344187.tar.gz | |
Don't use deprecated hb_font_funcs_set_glyph_func()
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | pango/pangofc-shape.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index d78ef0e8..0b37a0be 100644 --- a/configure.ac +++ b/configure.ac @@ -208,7 +208,7 @@ AM_CONDITIONAL(CROSS_COMPILING, [test $cross_compiling = yes]) # Checks for HarfBuzz # have_harfbuzz=false -PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= 0.9.30, have_harfbuzz=true, :) +PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= 1.2.3, have_harfbuzz=true, :) AM_CONDITIONAL(HAVE_HARFBUZZ, $have_harfbuzz) # diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c index 6cd98184..a18fa732 100644 --- a/pango/pangofc-shape.c +++ b/pango/pangofc-shape.c @@ -76,10 +76,10 @@ typedef struct _PangoFcHbContext { } PangoFcHbContext; static hb_bool_t -pango_fc_hb_font_get_glyph (hb_font_t *font, void *font_data, - hb_codepoint_t unicode, hb_codepoint_t variation_selector, - hb_codepoint_t *glyph, - void *user_data G_GNUC_UNUSED) +pango_fc_hb_font_get_nominal_glyph (hb_font_t *font, void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data G_GNUC_UNUSED) { PangoFcHbContext *context = (PangoFcHbContext *) font_data; PangoFcFont *fc_font = context->fc_font; @@ -245,7 +245,8 @@ 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); + hb_font_funcs_set_nominal_glyph_func (funcs, pango_fc_hb_font_get_nominal_glyph, NULL, NULL); + /* XXX we don't support variation selectors yet :(. */ hb_font_funcs_set_glyph_h_advance_func (funcs, pango_fc_hb_font_get_glyph_advance, NULL, NULL); hb_font_funcs_set_glyph_v_advance_func (funcs, pango_fc_hb_font_get_glyph_advance, NULL, NULL); hb_font_funcs_set_glyph_h_origin_func (funcs, pango_fc_hb_font_get_glyph_h_origin, NULL, NULL); |