diff options
| author | Sven Neumann <sven@gimp.org> | 2002-07-22 17:54:10 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2002-07-22 17:54:10 +0000 |
| commit | e950a63fb104357fb2f0ffaf9a245df626e5da30 (patch) | |
| tree | de702e2d77de32543aebd585716d19d703f8220e /pango/pangoft2.c | |
| parent | b3c8ee4d85113294e4d0c3e80f3a2040a20b0c6c (diff) | |
| download | pango-e950a63fb104357fb2f0ffaf9a245df626e5da30.tar.gz | |
don't access the old (invalid) face pointer after loading a fallback face
2002-07-22 Sven Neumann <sven@gimp.org>
* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
(invalid) face pointer after loading a fallback face because we
couldn't set the unicode charmap.
Diffstat (limited to 'pango/pangoft2.c')
| -rw-r--r-- | pango/pangoft2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 5550f7c3..c27ef2db 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -248,9 +248,7 @@ pango_ft2_font_get_face (PangoFont *font) g_assert (ft2font->face); - face = ft2font->face; - - if (!set_unicode_charmap (face)) + if (!set_unicode_charmap (ft2font->face)) { g_warning ("Unable to load unicode charmap from font file %s", filename); @@ -260,6 +258,8 @@ pango_ft2_font_get_face (PangoFont *font) load_fallback_face (ft2font, filename); } + face = ft2font->face; + if (ft2font->size != GPOINTER_TO_UINT (face->generic.data)) { face->generic.data = GUINT_TO_POINTER (ft2font->size); |