From b4c8ac299fdf0a2e6d1d4b64b7437315cffa3489 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@nokia.com>
Date: Thu, 27 Oct 2011 16:01:01 +0200
Subject: [PATCH] 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>
---
 src/gui/text/qfontengine_ft.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index c43ccd06085..37bbd4ffee8 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);
     }