diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-07 08:00:22 +0400 |
---|---|---|
committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-20 13:43:05 +0000 |
commit | 7cd1c0e420933cfc10019d6a592b85311e5e5fe0 (patch) | |
tree | 7443be01751f0311aa827d64eff30d3496da12ac /src/gui/text | |
parent | 7ff3a7d3a3b5370cc2318022496d2d285ed2b3f6 (diff) |
[QFontEngineFT] Fix memory leaks and possible double deletions
The glyph returned by loadGlyph() must be freed manually when caching
is not enabled, except when it is a placeholder for a missing glyph.
This is a fix-up for d18ccbb5be23eaea5eb5f1af2ae0fba334ab21d7.
Task-number: QTBUG-32792
Task-number: QTBUG-44812
Change-Id: I410fa1b7703e306739d9dae35fff06af6c79dce0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui/text')
-rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 8ae178c6ad..5cc837d192 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -1756,7 +1756,6 @@ QImage *QFontEngineFT::lockedAlphaMapForGlyph(glyph_t glyphIndex, QFixed subPixe }; QFontEngineFT::Glyph *glyph; - QScopedPointer<QFontEngineFT::Glyph> glyphGuard; if (cacheEnabled) { QGlyphSet *gset = loadGlyphSet(t); QFontEngine::HintStyle hintStyle = default_hint_style; @@ -1772,15 +1771,13 @@ QImage *QFontEngineFT::lockedAlphaMapForGlyph(glyph_t glyphIndex, QFixed subPixe freetype->matrix = m; } - if (!gset || gset->outline_drawing || !loadGlyph(gset, glyphIndex, subPixelPosition, - neededFormat)) { + if (!gset || gset->outline_drawing || !(glyph = loadGlyph(gset, glyphIndex, subPixelPosition, + neededFormat))) { default_hint_style = hintStyle; return QFontEngine::lockedAlphaMapForGlyph(glyphIndex, subPixelPosition, neededFormat, t, offset); } default_hint_style = hintStyle; - - glyph = gset->getGlyph(glyphIndex, subPixelPosition); } else { FT_Matrix m = matrix; FT_Matrix extra = QTransformToFTMatrix(t); @@ -1788,10 +1785,11 @@ QImage *QFontEngineFT::lockedAlphaMapForGlyph(glyph_t glyphIndex, QFixed subPixe FT_Set_Transform(freetype->face, &m, 0); freetype->matrix = m; glyph = loadGlyph(0, glyphIndex, subPixelPosition, neededFormat); - glyphGuard.reset(glyph); } if (glyph == 0 || glyph->data == 0 || glyph->width == 0 || glyph->height == 0) { + if (!cacheEnabled && glyph != &emptyGlyph) + delete glyph; unlockFace(); return 0; } @@ -1816,8 +1814,10 @@ QImage *QFontEngineFT::lockedAlphaMapForGlyph(glyph_t glyphIndex, QFixed subPixe *offset = QPoint(glyph->x, -glyph->y); currentlyLockedAlphaMap = QImage(glyph->data, glyph->width, glyph->height, pitch, format); - if (!glyphGuard.isNull()) + if (!cacheEnabled && glyph != &emptyGlyph) { currentlyLockedAlphaMap = currentlyLockedAlphaMap.copy(); + delete glyph; + } Q_ASSERT(!currentlyLockedAlphaMap.isNull()); QImageData *data = currentlyLockedAlphaMap.data_ptr(); @@ -1866,8 +1866,10 @@ QImage QFontEngineFT::alphaMapForGlyph(glyph_t g, QFixed subPixelPosition, const { lockFace(); - QScopedPointer<Glyph> glyph(loadGlyphFor(g, subPixelPosition, antialias ? Format_A8 : Format_Mono, t)); + Glyph *glyph = loadGlyphFor(g, subPixelPosition, antialias ? Format_A8 : Format_Mono, t); if (!glyph || !glyph->data) { + if (!cacheEnabled && glyph != &emptyGlyph) + delete glyph; unlockFace(); return QFontEngine::alphaMapForGlyph(g); } @@ -1886,8 +1888,9 @@ QImage QFontEngineFT::alphaMapForGlyph(glyph_t g, QFixed subPixelPosition, const for (int y = 0; y < glyph->height; ++y) memcpy(img.scanLine(y), &glyph->data[y * pitch], pitch); } - if (cacheEnabled) - glyph.take(); + + if (!cacheEnabled && glyph != &emptyGlyph) + delete glyph; unlockFace(); return img; @@ -1900,8 +1903,10 @@ QImage QFontEngineFT::alphaRGBMapForGlyph(glyph_t g, QFixed subPixelPosition, co lockFace(); - QScopedPointer<Glyph> glyph(loadGlyphFor(g, subPixelPosition, Format_A32, t)); + Glyph *glyph = loadGlyphFor(g, subPixelPosition, Format_A32, t); if (!glyph || !glyph->data) { + if (!cacheEnabled && glyph != &emptyGlyph) + delete glyph; unlockFace(); return QFontEngine::alphaRGBMapForGlyph(g, subPixelPosition, t); } @@ -1909,8 +1914,8 @@ QImage QFontEngineFT::alphaRGBMapForGlyph(glyph_t g, QFixed subPixelPosition, co QImage img(glyph->width, glyph->height, QImage::Format_RGB32); memcpy(img.bits(), glyph->data, 4 * glyph->width * glyph->height); - if (cacheEnabled) - glyph.take(); + if (!cacheEnabled && glyph != &emptyGlyph) + delete glyph; unlockFace(); return img; |