From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Wed, 15 Feb 2012 13:41:07 +0000 (+0100)
Subject: Don't render glyph with FT with fetchMetricsOnly
X-Git-Tag: qt-v5.0.0-alpha1~1018
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=692064bcfd116c2f3a2b30572e511ee68c6a0531;p=profile%2Fivi%2Fqtbase.git

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: I0f623cb4f79da2edf6e9c9634a2f22fb0c66823c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---

diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 8880eb7..14e2dba 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -877,7 +877,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 || set->outline_drawing) && fetchMetricsOnly)
+    if (!set || set->outline_drawing || fetchMetricsOnly)
         return 0;
 
     FT_GlyphSlot slot = face->glyph;