summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-17 10:53:42 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-17 10:53:42 +0200
commit3cb56800d581dabd18e354a24f018c55bd91f748 (patch)
tree9b8e95cf62e22026463a0f87a3625b279f457aad /src/platformsupport/fontdatabases
parentaed7540d45096791d1a824f500694a15426fd94b (diff)
parent3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts: tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd
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 140b6c129f..971f0b0cce 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();