diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:30:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:30:02 +0200 |
| commit | c4e472ea1037afde7b99d9132a49eb616cad240e (patch) | |
| tree | c9e66fdda63a2e5c3f5a944d711e5c9845de33ac /src/platformsupport | |
| parent | 7b23ebefb2360feb139ff6e10d2253396e58721e (diff) | |
| parent | 6c1e352803a6efbd8b14e5296434e22165b65084 (diff) | |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Conflicts:
src/corelib/tools/qsimd_p.h
Change-Id: I7c6bfc5873d97ad7f51a540dd9c18b9359dde59f
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 4 |
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(); |