summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-16 12:25:24 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-06-16 12:25:24 +0000
commit3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (patch)
tree84bb5a5f766ce04ff4d243a38ce5e408db5e7782 /src/platformsupport/fontdatabases
parent874eb8b44b3ca9cfab63372af10886d16dfc327d (diff)
parentc4e472ea1037afde7b99d9132a49eb616cad240e (diff)
Merge "Merge remote-tracking branch 'origin/5.7.0' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/platformsupport/fontdatabases')
-rw-r--r--src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index 3d214b6f39..942bb6c6bb 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -251,9 +251,9 @@ void QCoreTextFontEngine::init()
QByteArray os2Table = getSfntTable(MAKE_TAG('O', 'S', '/', '2'));
unsigned emSize = CTFontGetUnitsPerEm(ctfont);
if (os2Table.size() >= 10) {
- fsType = qFromBigEndian<quint16>(reinterpret_cast<const uchar *>(os2Table.constData() + 8));
+ fsType = qFromBigEndian<quint16>(os2Table.constData() + 8);
// qAbs is a workaround for weird fonts like Lucida Grande
- qint16 width = qAbs(qFromBigEndian<qint16>(reinterpret_cast<const uchar *>(os2Table.constData() + 2)));
+ qint16 width = qAbs(qFromBigEndian<qint16>(os2Table.constData() + 2));
avgCharWidth = QFixed::fromReal(width * fontDef.pixelSize / emSize);
} else
avgCharWidth = QFontEngine::averageCharWidth();