summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorSérgio Martins <sergio.martins@kdab.com>2014-12-02 13:28:08 +0000
committerKonstantin Ritt <ritt.ks@gmail.com>2014-12-02 18:22:06 +0100
commite7e6d6f95a029abb52dcbb541bc333fa05cc4929 (patch)
tree3b0ee8b1873933259e36225695cba5ebd7103c5e /src/gui/text
parent98d130fc46ef5ff7c3d1138a4a9949a1c2594c47 (diff)
QFontEngine_FT: Don't check for null after dereferencing.
Must have been a copy paste mistake, the check is used in other places to make sure we don't unlockFace() without a lockFace(), but here we're certain lockFace() was called first. Makes Coverity happy. Change-Id: I679129727b29a40d780f4fa903f44f7cbc9ec8cf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontengine_ft.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 44c0a50bfc..e2c8f905b9 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -1771,8 +1771,7 @@ glyph_metrics_t QFontEngineFT::alphaMapBoundingBox(glyph_t glyph, QFixed subPixe
overall.x = TRUNC(left);
overall.y = -TRUNC(top);
overall.xoff = TRUNC(ROUND(face->glyph->advance.x));
- if (face)
- unlockFace();
+ unlockFace();
}
return overall;
}