diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-16 12:25:24 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-16 12:25:24 +0000 |
commit | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (patch) | |
tree | 84bb5a5f766ce04ff4d243a38ce5e408db5e7782 /src/gui | |
parent | 874eb8b44b3ca9cfab63372af10886d16dfc327d (diff) | |
parent | c4e472ea1037afde7b99d9132a49eb616cad240e (diff) |
Merge "Merge remote-tracking branch 'origin/5.7.0' into 5.7" into refs/staging/5.7
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; } |