summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-06-30 10:54:46 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-06-30 10:57:44 (GMT)
commitd58eec3c932d1cdbcf3b42534e8fe870ec109487 (patch)
tree5496a91958cc9d43dc300b632ea5bc8afba28a36
parentf54c5d9133d7aa7636988db36fa6cc51d26434b6 (diff)
downloadQt-d58eec3c932d1cdbcf3b42534e8fe870ec109487.zip
Qt-d58eec3c932d1cdbcf3b42534e8fe870ec109487.tar.gz
Qt-d58eec3c932d1cdbcf3b42534e8fe870ec109487.tar.bz2
Fix resource leak in QFontEngineDirectWrite
Bug introduced by f54c5d9133d7aa7636988db36fa6cc51d26434b6. The release statement has to come before the return statement :) Reviewed-by: Jiang Jiang
-rw-r--r--src/gui/text/qfontenginedirectwrite.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/text/qfontenginedirectwrite.cpp b/src/gui/text/qfontenginedirectwrite.cpp
index b6a172e..d693273 100644
--- a/src/gui/text/qfontenginedirectwrite.cpp
+++ b/src/gui/text/qfontenginedirectwrite.cpp
@@ -623,15 +623,16 @@ QImage QFontEngineDirectWrite::imageForGlyph(glyph_t t,
}
delete[] alphaValues;
+ glyphAnalysis->Release();
+
return img;
} else {
delete[] alphaValues;
+ glyphAnalysis->Release();
qErrnoWarning("QFontEngineDirectWrite::imageForGlyph: CreateAlphaTexture failed");
}
}
-
- glyphAnalysis->Release();
} else {
qErrnoWarning("QFontEngineDirectWrite::imageForGlyph: CreateGlyphRunAnalysis failed");
}