diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2013-01-17 17:11:19 -0600 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2013-01-17 17:11:19 -0600 |
| commit | 10cc6557ba24239570ee9a7bcaa0a553aae9df95 (patch) | |
| tree | 254737369f2a5a9366a4ee95122f860a037adc13 /pango/pangoft2-render.c | |
| parent | f4987f06ee85a87b8e787bf0881de6a2223e8fd5 (diff) | |
| download | pango-10cc6557ba24239570ee9a7bcaa0a553aae9df95.tar.gz | |
Revert "Don't use the deprecated pango_ft2_font_get_face"
This reverts commit 2dc0c3dbb1c389c3a3ba12a5c5c85f21dca46e84.
This doesn't make sense. It ends up in infinite recursion because
pangofc is calling lock_face on pangoft2, which would recursively
call it on pangofc...
Was causing hang at startup of Inkscape.
If the deprecated warnings are an issue, they need to be dealt with
in some other way.
Diffstat (limited to 'pango/pangoft2-render.c')
| -rw-r--r-- | pango/pangoft2-render.c | 6 |
1 files changed, 1 insertions, 5 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, |