diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-12-07 06:08:39 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-12-07 06:08:39 +0000 |
| commit | 77741531e266f127839c7bb8fefcea43f3c5ebe0 (patch) | |
| tree | ac30ed4554c616b9cd0bae8df1c0c300689fc9b9 /pango/pangoft2.c | |
| parent | 92e4745dbbd339b8756a6b793d1610462089e49f (diff) | |
| download | pango-77741531e266f127839c7bb8fefcea43f3c5ebe0.tar.gz | |
Print out an informative error message and exit(1) if no fonts are found.
Sat Dec 7 01:05:25 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangofc-fontmap.cI (pango_fc_font_map_get_patterns):
Print out an informative error message and exit(1) if
no fonts are found. (#98672)
* pango/pangoft2.c (pango_ft2_font_get_face): Fix some
bugs in the last commit.
Diffstat (limited to 'pango/pangoft2.c')
| -rw-r--r-- | pango/pangoft2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 60770be7..80c78a50 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -200,7 +200,6 @@ FT_Face pango_ft2_font_get_face (PangoFont *font) { PangoFT2Font *ft2font = (PangoFT2Font *)font; - FT_Face face; FT_Error error; FcPattern *pattern; FcChar8 *filename; @@ -256,9 +255,7 @@ pango_ft2_font_get_face (PangoFont *font) load_fallback_face (ft2font, filename); } - face = ft2font->face; - - error = FT_Set_Char_Size (face, + error = FT_Set_Char_Size (ft2font->face, PANGO_PIXELS_26_6 (ft2font->size), PANGO_PIXELS_26_6 (ft2font->size), 0, 0); @@ -266,7 +263,7 @@ pango_ft2_font_get_face (PangoFont *font) g_warning ("Error in FT_Set_Char_Size: %d", error); } - return face; + return ft2font->face; } static GType |