diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 2002-07-15 18:57:27 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-07-15 18:57:27 +0000 |
| commit | bc8d8855f875ad4b9f738cd2c7146c92a3d82be1 (patch) | |
| tree | e4df540edada7349613613f2a8c3bacdac327c98 /pango | |
| parent | 3c96fd5ec916f05eba877ea92ba5ee63dc5b7a8e (diff) | |
| download | pango-bc8d8855f875ad4b9f738cd2c7146c92a3d82be1.tar.gz | |
on 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.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pangoft2.c | 17 |
1 files changed, 10 insertions, 7 deletions
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) |