diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 11 | ||||
-rw-r--r-- | pango/pangoft2.c | 17 |
7 files changed, 76 insertions, 7 deletions
@@ -1,3 +1,14 @@ +Mon Jul 15 14:56:34 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Move + setting of load_flags before we do any checks for the + font so they apply to the fallback font as well. + + * pango/pangoft2.c (pango_ft2_font_get_face): Supply + FT_LOAD_NO_BITMAP as temporary workaround for problems + with embedded bitmaps, since we can't render bitmap fonts + at the moment. + Wed Jul 3 18:54:14 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c: Fix some typos. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index f015f111..8abc7f3a 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,14 @@ +Mon Jul 15 14:56:34 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Move + setting of load_flags before we do any checks for the + font so they apply to the fallback font as well. + + * pango/pangoft2.c (pango_ft2_font_get_face): Supply + FT_LOAD_NO_BITMAP as temporary workaround for problems + with embedded bitmaps, since we can't render bitmap fonts + at the moment. + Wed Jul 3 18:54:14 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c: Fix some typos. diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index f015f111..8abc7f3a 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,14 @@ +Mon Jul 15 14:56:34 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Move + setting of load_flags before we do any checks for the + font so they apply to the fallback font as well. + + * pango/pangoft2.c (pango_ft2_font_get_face): Supply + FT_LOAD_NO_BITMAP as temporary workaround for problems + with embedded bitmaps, since we can't render bitmap fonts + at the moment. + Wed Jul 3 18:54:14 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c: Fix some typos. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index f015f111..8abc7f3a 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,14 @@ +Mon Jul 15 14:56:34 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Move + setting of load_flags before we do any checks for the + font so they apply to the fallback font as well. + + * pango/pangoft2.c (pango_ft2_font_get_face): Supply + FT_LOAD_NO_BITMAP as temporary workaround for problems + with embedded bitmaps, since we can't render bitmap fonts + at the moment. + Wed Jul 3 18:54:14 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c: Fix some typos. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index f015f111..8abc7f3a 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,14 @@ +Mon Jul 15 14:56:34 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Move + setting of load_flags before we do any checks for the + font so they apply to the fallback font as well. + + * pango/pangoft2.c (pango_ft2_font_get_face): Supply + FT_LOAD_NO_BITMAP as temporary workaround for problems + with embedded bitmaps, since we can't render bitmap fonts + at the moment. + Wed Jul 3 18:54:14 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c: Fix some typos. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index f015f111..8abc7f3a 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,14 @@ +Mon Jul 15 14:56:34 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangoft2.c (pango_ft2_font_get_face): Move + setting of load_flags before we do any checks for the + font so they apply to the fallback font as well. + + * pango/pangoft2.c (pango_ft2_font_get_face): Supply + FT_LOAD_NO_BITMAP as temporary workaround for problems + with embedded bitmaps, since we can't render bitmap fonts + at the moment. + Wed Jul 3 18:54:14 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c: Fix some typos. diff --git a/pango/pangoft2.c b/pango/pangoft2.c index a6c56393..5550f7c3 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -211,13 +211,10 @@ pango_ft2_font_get_face (PangoFont *font) if (!ft2font->face) { - if (FcPatternGetString (pattern, FC_FILE, 0, &filename) != FcResultMatch) - goto bail0; - - if (FcPatternGetInteger (pattern, FC_INDEX, 0, &id) != FcResultMatch) - goto bail0; - - ft2font->load_flags = FT_LOAD_DEFAULT; + /* If we add support for not antialising, then we should + * need to conditionalize NO_BITMAP on that. + */ + ft2font->load_flags = FT_LOAD_NO_BITMAP; /* disable hinting if requested */ if (FcPatternGetBool (pattern, FC_HINTING, 0, &hinting) != FcResultMatch) @@ -233,6 +230,12 @@ pango_ft2_font_get_face (PangoFont *font) if (autohint) ft2font->load_flags |= FT_LOAD_FORCE_AUTOHINT; + if (FcPatternGetString (pattern, FC_FILE, 0, &filename) != FcResultMatch) + goto bail0; + + if (FcPatternGetInteger (pattern, FC_INDEX, 0, &id) != FcResultMatch) + goto bail0; + error = FT_New_Face (_pango_ft2_font_map_get_library (ft2font->fontmap), (char *) filename, id, &ft2font->face); if (error != FT_Err_Ok) |