From cad70d64d0bbada72a072ac7fdf461839db9d72a Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Mon, 3 May 2010 09:55:44 +0200
Subject: New class: QGlyphs

Introduce an API to access glyph indexes in a font directly.

A bug was discovered during this work, where different hinting flags
in loadGlyph() and loadGlyphMetrics() would make the metrics in
the two functions different, thus causing drawCachedGlyphs()
(which uses loadGlyphMetrics() indirectly) to use different metrics
than the standard drawTextItem() code path (which uses loadGlyph()).
The bug was visible in the tst_QGlyphs::drawExistingGlyphs() test.

Reviewed-by: Simon Hausmann
---
 src/gui/text/qfontengine_mac.mm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'src/gui/text/qfontengine_mac.mm')

diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm
index 3be6d284c1..c9b5655889 100644
--- a/src/gui/text/qfontengine_mac.mm
+++ b/src/gui/text/qfontengine_mac.mm
@@ -607,6 +607,12 @@ void QCoreTextFontEngine::addGlyphsToPath(glyph_t *glyphs, QFixedPoint *position
     }
 }
 
+QFont QCoreTextFontEngine::createExplicitFont() const
+{
+    QString familyName = QCFString::toQString(CTFontCopyFamilyName(ctfont));
+    return createExplicitFontWithName(familyName);
+}
+
 QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, int margin, bool aa)
 {
     const glyph_metrics_t br = boundingBox(glyph);
@@ -1542,6 +1548,27 @@ static void addGlyphsToPathHelper(ATSUStyle style, glyph_t *glyphs, QFixedPoint
     DisposeATSCubicClosePathUPP(closePath);
 }
 
+QFont QFontEngineMac::createExplicitFont() const
+{
+    FMFont fmFont = FMGetFontFromATSFontRef(fontID);
+
+    FMFontFamily fmFamily;
+    FMFontStyle fmStyle;
+    QString familyName;
+    if (!FMGetFontFamilyInstanceFromFont(fmFont, &fmFamily, &fmStyle)) {
+        ATSFontFamilyRef familyRef = FMGetATSFontFamilyRefFromFontFamily(fmFamily);
+        QCFString cfFamilyName;;
+        ATSFontFamilyGetName(familyRef, kATSOptionFlagsDefault, &cfFamilyName);
+        familyName = cfFamilyName;
+    } else {
+        QCFString cfFontName;
+        ATSFontGetName(fontID, kATSOptionFlagsDefault, &cfFontName);
+        familyName = cfFontName;
+    }
+
+    return createExplicitFontWithName(familyName);
+}
+
 void QFontEngineMac::addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int numGlyphs, QPainterPath *path,
                                            QTextItem::RenderFlags)
 {
-- 
cgit v1.2.3