diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-04-12 06:13:13 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-14 14:28:07 +0200 |
| commit | 1f3a67e8701bd8e8d4e58ca740bc03781c10136b (patch) | |
| tree | db5ed5ab20ed80f3e854ccae4ee449a574084856 /src | |
| parent | 112b31bed6735a64810e425318b5a624c180acf2 (diff) | |
QFontEngine: Fix cache_cost might be not initialized
Change-Id: I4cf4de5797e6623a71593e8f382496188e3abac8
Reviewed-by: jian liang <jianliang79@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 1 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_qpa.cpp | 1 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index fcea2a0245..1ce70c6d83 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -199,6 +199,7 @@ QFontEngine::QFontEngine() font_(0), font_destroy_func(0), face_(0), face_destroy_func(0) { + cache_cost = 0; fsType = 0; symbol = false; diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp index 837850e4be..0a730abcac 100644 --- a/src/gui/text/qfontengine_qpa.cpp +++ b/src/gui/text/qfontengine_qpa.cpp @@ -688,6 +688,7 @@ void QFontEngineMultiQPA::init(QFontEngine *fe) fe->ref.ref(); fontDef = engines[0]->fontDef; setObjectName(QStringLiteral("QFontEngineMultiQPA")); + cache_cost = fe->cache_cost; } void QFontEngineMultiQPA::loadEngine(int at) diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm index 3e553acd0a..8d1c4ed064 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -189,6 +189,8 @@ void QCoreTextFontEngine::init() avgCharWidth = QFixed::fromReal(width * fontDef.pixelSize / emSize); } else avgCharWidth = QFontEngine::averageCharWidth(); + + cache_cost = (CTFontGetAscent(ctfont) + CTFontGetDescent(ctfont)) * avgCharWidth.toInt() * 2000; } bool QCoreTextFontEngine::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp index 90989c98f8..c0f1b3a000 100644 --- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp +++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp @@ -220,6 +220,7 @@ QWindowsFontEngineDirectWrite::QWindowsFontEngineDirectWrite(IDWriteFontFace *di fontDef.pixelSize = pixelSize; collectMetrics(); + cache_cost = (m_ascent.toInt() + m_descent.toInt()) * m_xHeight.toInt() * 2000; } QWindowsFontEngineDirectWrite::~QWindowsFontEngineDirectWrite() |