summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2012-02-15 13:18:21 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-15 19:03:45 (GMT)
commit5ffac0cfc732b994e60af0b6b965b1780ca41f2e (patch)
tree00f6640ba6de6447086c928a3f3c1089796dd6b0
parent6c4c5709a3f6150c4e37f38c7e7fd980ab359a53 (diff)
downloadQt-5ffac0cfc732b994e60af0b6b965b1780ca41f2e.zip
Qt-5ffac0cfc732b994e60af0b6b965b1780ca41f2e.tar.gz
Qt-5ffac0cfc732b994e60af0b6b965b1780ca41f2e.tar.bz2
Don't render glyph with FT with fetchMetricsOnly
Neither rendering with outline nor fetchMetricsOnly requires the rendering from FreeType so we don't need to render them or cache it. It should speed up recalcAdvances() quite a lot. Change-Id: Ic322507d54ab59020851e359088a4afa4e03c8db Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--src/gui/text/qfontengine_ft.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 0fd1848..c53e258 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -879,7 +879,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
if (err != FT_Err_Ok)
qWarning("load glyph failed err=%x face=%p, glyph=%d", err, face, glyph);
- if (set->outline_drawing && fetchMetricsOnly)
+ if (set->outline_drawing || fetchMetricsOnly)
return 0;
FT_GlyphSlot slot = face->glyph;