summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_ft.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-04-08 09:12:39 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-04-08 12:10:12 +0000
commita21a24ee485a2dc368d5e837cfc8aeb5c74717a1 (patch)
tree45ad650cf537332159bc5dcab0cce2d9d479f0d1 /src/gui/text/qfontengine_ft.cpp
parenta60571b3700e80f44705ebc4bab9628cf852891c (diff)
[QFontEngineFT::loadGlyph] Fix reversed condition.
Introduced by 237cb0d082b5518cecf42f1a2186134799de745e (Consolidate paths for fetchMetricsOnly cases). Task-number: QTBUG-45444 Change-Id: Icd642c09490f1cfc5804313d60d467290ae599ba Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/gui/text/qfontengine_ft.cpp')
-rw-r--r--src/gui/text/qfontengine_ft.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index f8ce7112bc..931c71dc63 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -804,12 +804,12 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags,
static inline bool areMetricsTooLarge(const QFontEngineFT::GlyphInfo &info)
{
// false if exceeds QFontEngineFT::Glyph metrics
- return (short)(info.linearAdvance) == info.linearAdvance
- && (signed char)(info.xOff) == info.xOff
- && (uchar)(info.width) == info.width
- && (uchar)(info.height) == info.height
- && (signed char)(info.x) == info.x
- && (signed char)(info.y) == info.y;
+ return (short)(info.linearAdvance) != info.linearAdvance
+ || (signed char)(info.xOff) != info.xOff
+ || (uchar)(info.width) != info.width
+ || (uchar)(info.height) != info.height
+ || (signed char)(info.x) != info.x
+ || (signed char)(info.y) != info.y;
}
QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,