From 5c2ff22ba117f295718c529198ab42ee4646d90c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 26 Apr 2016 16:40:37 -0700 Subject: Use void instead of uchar in the endian-swapping function parameters This allows us to pass pointers to storage that is not an array of uchar, which it hardly ever is. Change-Id: Ifea6e497f11a461db432ffff14490d2c2df21906 Reviewed-by: Konstantin Ritt Reviewed-by: Marc Mutz --- src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/platformsupport/fontdatabases') 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(reinterpret_cast(os2Table.constData() + 8)); + fsType = qFromBigEndian(os2Table.constData() + 8); // qAbs is a workaround for weird fonts like Lucida Grande - qint16 width = qAbs(qFromBigEndian(reinterpret_cast(os2Table.constData() + 2))); + qint16 width = qAbs(qFromBigEndian(os2Table.constData() + 2)); avgCharWidth = QFixed::fromReal(width * fontDef.pixelSize / emSize); } else avgCharWidth = QFontEngine::averageCharWidth(); -- cgit v1.2.3