diff options
author | Oliver Wolff <oliver.wolff@nokia.com> | 2011-10-27 16:01:01 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-28 00:49:53 +0200 |
commit | b4c8ac299fdf0a2e6d1d4b64b7437315cffa3489 (patch) | |
tree | 5ace7a50ca23c4683151dd4eb98d003cd780aee5 | |
parent | 6476ac738ca029af95932f53b53f0705808eb80e (diff) |
Freetype: Do not unlock face when returning superclass value in lockedAlphaMapForGlyph
If the face is unlocked in this case, calling unlockAlphaMapForGlyph after doing
the operation will cause an assert.
Change-Id: Icb2310a3b139e5bedf24f9c3794bd7d3fd38cfea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
-rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index c43ccd0608..37bbd4ffee 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -1832,7 +1832,6 @@ QImage *QFontEngineFT::lockedAlphaMapForGlyph(glyph_t glyphIndex, QFixed subPixe if (!gset || gset->outline_drawing || !loadGlyph(gset, glyphIndex, subPixelPosition, neededFormat)) { - unlockFace(); return QFontEngine::lockedAlphaMapForGlyph(glyphIndex, subPixelPosition, neededFormat, t, offset); } |