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/gui/text/qfontengine_qpf2.cpp | 2 +- src/gui/text/qfontsubset.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui') diff --git a/src/gui/text/qfontengine_qpf2.cpp b/src/gui/text/qfontengine_qpf2.cpp index c3a911fc55..2e4af09550 100644 --- a/src/gui/text/qfontengine_qpf2.cpp +++ b/src/gui/text/qfontengine_qpf2.cpp @@ -533,7 +533,7 @@ void QPF2Generator::writeHeader() { const QByteArray head = fe->getSfntTable(MAKE_TAG('h', 'e', 'a', 'd')); if (head.size() >= 4) { - const quint32 revision = qFromBigEndian(reinterpret_cast(head.constData())); + const quint32 revision = qFromBigEndian(head.constData()); writeTaggedUInt32(QFontEngineQPF2::Tag_FontRevision, revision); } } diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index f591b4333c..c8f0393084 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -1145,7 +1145,7 @@ static QByteArray bindFont(const QVector& _tables) // calculate the fonts checksum and qToBigEndian into 'head's checksum_adjust quint32 checksum_adjust = 0xB1B0AFBA - checksum(font); - qToBigEndian(checksum_adjust, (uchar *)font.data() + head_offset + 8); + qToBigEndian(checksum_adjust, font.data() + head_offset + 8); return font; } -- cgit v1.2.3