From e11cf63b0babcba8709cd39ff46e43e773f7fa9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 11 Jan 2013 16:58:43 +0100 Subject: Fix crash when trying to create paths for color-glyphs (Emoji) on Mac CoreText segfaults when creating paths for color-glyphs: 0 0x00007fff8fd41e69 in TFont::FindColourBitmapForGlyph () 1 0x00007fff8fd417ac in TFont::CreatePathForGlyph () 2 0x000000010567d1af in QCoreTextFontEngine::addGlyphsToPath (...) So we shortcut the code-path, since we don't support Emoji yet anyways. Task-number: QTBUG-28615 Change-Id: Ife16ae4959077d9eaaf6ea5cd1f27a4e2e01e7f5 Reviewed-by: Eskil Abrahamsen Blomfeldt --- .../fontdatabases/mac/qfontengine_coretext_p.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h') diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h index 6c5c557b13..b3a0968c4b 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h @@ -108,6 +108,21 @@ public: virtual QFontEngine *cloneWithSize(qreal pixelSize) const; virtual int glyphMargin(QFontEngineGlyphCache::Type type) { Q_UNUSED(type); return 0; } + static bool supportsColorGlyphs() + { +#if defined(Q_OS_IOS) + return true; +#elif MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 + #if MAC_OS_X_VERSION_MIN_REQUIRED < 1070 + return &CTFontDrawGlyphs; + #else + return true; + #endif +#else + return false; +#endif + } + static int antialiasingThreshold; static QFontEngineGlyphCache::Type defaultGlyphFormat; -- cgit v1.2.3