diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-06-21 15:32:22 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-06-21 15:32:22 +0000 |
| commit | ffc0b21393fcfb8be247afe7ad32291ab4431d4a (patch) | |
| tree | 8dc2ad7b0798249688419efec01dfbe8c21d99d9 /pango/pangofc-font.c | |
| parent | 329566a3e3af0cfebdb561978e6622ebe8208108 (diff) | |
| download | pango-ffc0b21393fcfb8be247afe7ad32291ab4431d4a.tar.gz | |
For cleanliness, unref the fontmap if we get an error from FreeType.
Mon Jun 21 11:29:39 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2-fontmap.c (pango_ft2_font_map_new):
For cleanliness, unref the fontmap if we get an error
from FreeType. (#143524, Morten Welinder)
* pango/pangoft2-fontmap.c (pango_ft2_font_map_finalize):
Deal with NULL ft2fontmap->library.
Diffstat (limited to 'pango/pangofc-font.c')
| -rw-r--r-- | pango/pangofc-font.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index a7e35ebf..0f9cdbc6 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -304,11 +304,21 @@ get_face_metrics (PangoFcFont *fcfont, FT_Vector_Transform (&vector, &ft_matrix); metrics->ascent = PANGO_UNITS_26_6 (vector.y); } - else + else if (hinting) { metrics->descent = - PANGO_UNITS_26_6 (face->size->metrics.descender); metrics->ascent = PANGO_UNITS_26_6 (face->size->metrics.ascender); } + else + { + FT_Fixed ascender, descender; + + descender = FT_MulFix (face->descender, face->size->metrics.y_scale); + metrics->descent = - PANGO_UNITS_26_6 (descender); + + ascender = FT_MulFix (face->ascender, face->size->metrics.y_scale); + metrics->ascent = PANGO_UNITS_26_6 (ascender); + } /* Versions of FreeType < 2.1.8 get underline thickness wrong * for Postscript fonts (always zero), so we need a fallback |