diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-05 13:17:26 +0200 |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-05 13:39:11 +0200 |
| commit | 1daf67042da6e25ae1a2733b374f83375d79b713 (patch) | |
| tree | b1459a45a2a94bdb01e9363c6ad70cc8b8716758 /src/gui/text | |
| parent | 05a1416be87528ba722d7735ed49701c634de083 (diff) | |
Only enable design metrics for scalable fonts
Bitmap fonts don't have linear advance at all.
Reviewed-by: Eskil
(cherry picked from commit 111accbf9aaf95b052448ecb70937c61e9b59d66)
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 237cde4ed1..4dae2a3784 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -1597,7 +1597,7 @@ void QFontEngineFT::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFlag FT_Face face = 0; bool design = (default_hint_style == HintNone || default_hint_style == HintLight || - (flags & HB_ShaperFlag_UseDesignMetrics)); + (flags & HB_ShaperFlag_UseDesignMetrics)) && FT_IS_SCALABLE(freetype->face); for (int i = 0; i < glyphs->numGlyphs; i++) { Glyph *g = defaultGlyphSet.getGlyph(glyphs->glyphs[i]); if (g) { |