diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-03-07 01:51:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-08 00:21:53 +0100 |
| commit | 7ef5a8528eea1419ef62dafa90b5174b48a04e6a (patch) | |
| tree | 8f55331fea5582242095f3b6b2c0af676a14c8f7 | |
| parent | 8fdd11465cd17006a108a6f04b2fb1bf8fc5de2f (diff) | |
Improve code readability
Since we were requesting a multi font engine, the returned font engine
must be a multi one or nothing at all.
Change-Id: I1ee4e1b7c68f54c83a8c7292082d015ebfa0a8cb
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| -rw-r--r-- | src/gui/text/qfontengine_qpa.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp index e9252b328e..90c9cbb1bb 100644 --- a/src/gui/text/qfontengine_qpa.cpp +++ b/src/gui/text/qfontengine_qpa.cpp @@ -731,10 +731,9 @@ QFontEngine* QFontEngineMultiQPA::createMultiFontEngine(QFontEngine *fe, int scr QFontCache::EngineCache::Iterator it = fc->engineCache.find(key), end = fc->engineCache.end(); while (it != end && it.key() == key) { - QFontEngineMulti *cachedEngine = 0; - if (it.value().data->type() == QFontEngine::Multi) - cachedEngine = static_cast<QFontEngineMulti *>(it.value().data); - if (faceIsLocal || (cachedEngine && fe == cachedEngine->engine(0))) { + Q_ASSERT(it.value().data->type() == QFontEngine::Multi); + QFontEngineMulti *cachedEngine = static_cast<QFontEngineMulti *>(it.value().data); + if (faceIsLocal || fe == cachedEngine->engine(0)) { engine = cachedEngine; fc->updateHitCountAndTimeStamp(it.value()); break; |