diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-10 09:41:53 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-10 09:41:53 (GMT) |
| commit | ab5d00edea76d3b1d38d6e7e59159042ec69f2f2 (patch) | |
| tree | 43acf3c547a465e657e4621616562f7f9e3ce5fb /src/gui/painting | |
| parent | 16de24d638deafb6e985b531fdf0c15691c0b7b4 (diff) | |
| download | Qt-ab5d00edea76d3b1d38d6e7e59159042ec69f2f2.zip Qt-ab5d00edea76d3b1d38d6e7e59159042ec69f2f2.tar.gz Qt-ab5d00edea76d3b1d38d6e7e59159042ec69f2f2.tar.bz2 | |
Clean up the QFontEngine glyphcaching code to not crash and be more tidy
Reviewed-by: Eskil
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 4a72434..aa3b89e 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3018,10 +3018,10 @@ void QRasterPaintEngine::drawCachedGlyphs(const QPointF &p, const QTextItemInt & QFontEngineGlyphCache::Type glyphType = ti.fontEngine->glyphFormat >= 0 ? QFontEngineGlyphCache::Type(ti.fontEngine->glyphFormat) : d->glyphCacheType; QImageTextureGlyphCache *cache = - (QImageTextureGlyphCache *) ti.fontEngine->glyphCache(glyphType, s->matrix); + (QImageTextureGlyphCache *) ti.fontEngine->glyphCache(0, glyphType, s->matrix); if (!cache) { cache = new QImageTextureGlyphCache(glyphType, s->matrix); - ti.fontEngine->setGlyphCache(glyphType, cache); + ti.fontEngine->setGlyphCache(0, cache); } cache->populate(ti, glyphs, positions); |