From a21a24ee485a2dc368d5e837cfc8aeb5c74717a1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 8 Apr 2015 09:12:39 +0200 Subject: [QFontEngineFT::loadGlyph] Fix reversed condition. Introduced by 237cb0d082b5518cecf42f1a2186134799de745e (Consolidate paths for fetchMetricsOnly cases). Task-number: QTBUG-45444 Change-Id: Icd642c09490f1cfc5804313d60d467290ae599ba Reviewed-by: Friedemann Kleint Reviewed-by: Laszlo Agocs --- src/gui/text/qfontengine_ft.cpp | 12 ++++++------ 1 file 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, -- cgit v1.2.3