diff options
| -rw-r--r-- | pango/pangoft2-render.c | 6 | ||||
| -rw-r--r-- | pango/pangoft2.c | 17 |
2 files changed, 6 insertions, 17 deletions
diff --git a/pango/pangoft2-render.c b/pango/pangoft2-render.c index 60cf4329..42923f49 100644 --- a/pango/pangoft2-render.c +++ b/pango/pangoft2-render.c @@ -210,7 +210,7 @@ pango_ft2_font_render_glyph (PangoFont *font, return box; } - face = pango_fc_font_lock_face (PANGO_FC_FONT (font)); + face = pango_ft2_font_get_face (font); if (face) { @@ -231,8 +231,6 @@ pango_ft2_font_render_glyph (PangoFont *font, rendered->bitmap_left = face->glyph->bitmap_left; rendered->bitmap_top = face->glyph->bitmap_top; - pango_fc_font_unlock_face (PANGO_FC_FONT (font)); - if (G_UNLIKELY (!rendered->bitmap.buffer)) { g_slice_free (PangoFT2RenderedGlyph, rendered); return NULL; @@ -242,8 +240,6 @@ pango_ft2_font_render_glyph (PangoFont *font, } else { - pango_fc_font_unlock_face (PANGO_FC_FONT (font)); - generic_box: return pango_ft2_font_render_box_glyph (PANGO_UNKNOWN_GLYPH_WIDTH, PANGO_UNKNOWN_GLYPH_HEIGHT, diff --git a/pango/pangoft2.c b/pango/pangoft2.c index cbe1d210..dc6db5da 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -424,13 +424,12 @@ pango_ft2_font_get_kerning (PangoFont *font, static FT_Face pango_ft2_font_real_lock_face (PangoFcFont *font) { - return pango_fc_font_lock_face (font); + return pango_ft2_font_get_face ((PangoFont *)font); } static void -pango_ft2_font_real_unlock_face (PangoFcFont *font) +pango_ft2_font_real_unlock_face (PangoFcFont *font G_GNUC_UNUSED) { - pango_fc_font_unlock_face (font); } static gboolean @@ -500,18 +499,12 @@ pango_ft2_font_get_coverage (PangoFont *font, PangoGlyph pango_ft2_get_unknown_glyph (PangoFont *font) { - PangoFcFont *fc_font = PANGO_FC_FONT (font); - FT_Face face; - PangoGlyph glyph; - - face = pango_fc_font_lock_face (fc_font); + FT_Face face = pango_ft2_font_get_face (font); if (face && FT_IS_SFNT (face)) /* TrueType fonts have an 'unknown glyph' box on glyph index 0 */ - glyph = 0; + return 0; else - glyph = PANGO_GLYPH_EMPTY; - pango_fc_font_unlock_face (fc_font); - return glyph; + return PANGO_GLYPH_EMPTY; } typedef struct |