diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-04-26 16:40:37 -0700 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-05-26 18:02:49 +0000 |
| commit | 5c2ff22ba117f295718c529198ab42ee4646d90c (patch) | |
| tree | bc1a9625b580dde5dd961203b944a18531d306bf /src/gui | |
| parent | 2fb026d58b45f50ed7d5666de58c9184e81bbc60 (diff) | |
Use void instead of uchar in the endian-swapping function parametersv5.7.0-rc1
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 <ritt.ks@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfontengine_qpf2.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qfontsubset.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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<quint32>(reinterpret_cast<const uchar *>(head.constData())); + const quint32 revision = qFromBigEndian<quint32>(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<QTtfTable>& _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; } |