diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 8 | ||||
| -rw-r--r-- | pango/pangoft2.c | 28 |
7 files changed, 59 insertions, 17 deletions
@@ -1,3 +1,11 @@ +Sat Dec 7 00:10:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Don't + use face->generic.data to hold the size the face is + currently set to; we don't need it currently and + it interferes with the use of face->generic.data for + OpenType data. (#93822, frequently reported bug) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 28d5a7f5..4641d745 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +Sat Dec 7 00:10:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Don't + use face->generic.data to hold the size the face is + currently set to; we don't need it currently and + it interferes with the use of face->generic.data for + OpenType data. (#93822, frequently reported bug) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 28d5a7f5..4641d745 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,11 @@ +Sat Dec 7 00:10:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Don't + use face->generic.data to hold the size the face is + currently set to; we don't need it currently and + it interferes with the use of face->generic.data for + OpenType data. (#93822, frequently reported bug) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 28d5a7f5..4641d745 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +Sat Dec 7 00:10:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Don't + use face->generic.data to hold the size the face is + currently set to; we don't need it currently and + it interferes with the use of face->generic.data for + OpenType data. (#93822, frequently reported bug) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 28d5a7f5..4641d745 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +Sat Dec 7 00:10:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Don't + use face->generic.data to hold the size the face is + currently set to; we don't need it currently and + it interferes with the use of face->generic.data for + OpenType data. (#93822, frequently reported bug) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 28d5a7f5..4641d745 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +Sat Dec 7 00:10:02 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Don't + use face->generic.data to hold the size the face is + currently set to; we don't need it currently and + it interferes with the use of face->generic.data for + OpenType data. (#93822, frequently reported bug) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/pango/pangoft2.c b/pango/pangoft2.c index b404eb98..60770be7 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -243,26 +243,20 @@ pango_ft2_font_get_face (PangoFont *font) bail0: load_fallback_face (ft2font, filename); } - ft2font->face->generic.data = 0; - } - g_assert (ft2font->face); - - if (!set_unicode_charmap (ft2font->face)) - { - g_warning ("Unable to load unicode charmap from font file %s", filename); + g_assert (ft2font->face); - FT_Done_Face (ft2font->face); - ft2font->face = NULL; - - load_fallback_face (ft2font, filename); - } - - face = ft2font->face; + if (!set_unicode_charmap (ft2font->face)) + { + g_warning ("Unable to load unicode charmap from font file %s", filename); + + FT_Done_Face (ft2font->face); + ft2font->face = NULL; + + load_fallback_face (ft2font, filename); + } - if (ft2font->size != GPOINTER_TO_UINT (face->generic.data)) - { - face->generic.data = GUINT_TO_POINTER (ft2font->size); + face = ft2font->face; error = FT_Set_Char_Size (face, PANGO_PIXELS_26_6 (ft2font->size), |