diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-06-08 07:58:37 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-06-08 08:04:21 (GMT) |
| commit | 00898f5df8cf885f0080cd8e13ba435a36758df3 (patch) | |
| tree | 24a8260e765809f6be235f2c20eaa4c4c43e68c9 /src/gui/text | |
| parent | f5a63feb8953799de7e787f333575ee37fae8a3f (diff) | |
| download | Qt-00898f5df8cf885f0080cd8e13ba435a36758df3.zip Qt-00898f5df8cf885f0080cd8e13ba435a36758df3.tar.gz Qt-00898f5df8cf885f0080cd8e13ba435a36758df3.tar.bz2 | |
Revert 36e01e69
The way we handle glyph cache in QFontEngineFT has changed, the
memory leak fix should not be applied to 4.8.
Reviewed-by: Eskil
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index f514942..776615c 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -1751,7 +1751,6 @@ glyph_metrics_t QFontEngineFT::alphaMapBoundingBox(glyph_t glyph, QFixed subPixe } else { glyphSet = &defaultGlyphSet; } - bool needsDelete = false; Glyph * g = glyphSet->getGlyph(glyph); if (!g || g->format != format) { face = lockFace(); @@ -1759,7 +1758,6 @@ glyph_metrics_t QFontEngineFT::alphaMapBoundingBox(glyph_t glyph, QFixed subPixe FT_Matrix_Multiply(&glyphSet->transformationMatrix, &m); freetype->matrix = m; g = loadGlyph(glyphSet, glyph, subPixelPosition, format); - needsDelete = true; } if (g) { @@ -1768,8 +1766,6 @@ glyph_metrics_t QFontEngineFT::alphaMapBoundingBox(glyph_t glyph, QFixed subPixe overall.width = g->width; overall.height = g->height; overall.xoff = g->advance; - if (needsDelete) - delete g; } else { int left = FLOOR(face->glyph->metrics.horiBearingX); int right = CEIL(face->glyph->metrics.horiBearingX + face->glyph->metrics.width); |