diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/painting/qdrawhelper_p.h | 2 | ||||
-rw-r--r-- | src/gui/text/qfontengine_qpa.cpp | 1 | ||||
-rw-r--r-- | src/gui/text/qfontengine_qpa_p.h | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index f4c29996b4..418294c56d 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -702,7 +702,7 @@ struct quint24 { quint24(uint value); operator uint() const; uchar data[3]; -} Q_PACKED; +}; inline quint24::quint24(uint value) { diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp index 9b21d61aad..28b95bd509 100644 --- a/src/gui/text/qfontengine_qpa.cpp +++ b/src/gui/text/qfontengine_qpa.cpp @@ -169,6 +169,7 @@ const QFontEngineQPA::Glyph *QFontEngineQPA::findGlyph(glyph_t g) const bool QFontEngineQPA::verifyHeader(const uchar *data, int size) { + VERIFY(quintptr(data) % Q_ALIGNOF(Header) == 0); VERIFY(size >= int(sizeof(Header))); const Header *header = reinterpret_cast<const Header *>(data); if (header->magic[0] != 'Q' diff --git a/src/gui/text/qfontengine_qpa_p.h b/src/gui/text/qfontengine_qpa_p.h index 5fbdafdf56..c8b40abd7f 100644 --- a/src/gui/text/qfontengine_qpa_p.h +++ b/src/gui/text/qfontengine_qpa_p.h @@ -131,7 +131,7 @@ public: GlyphBlock }; - struct Q_PACKED Header + struct Header { char magic[4]; // 'QPF2' quint32 lock; // values: 0 = unlocked, 0xffffffff = read-only, otherwise qws client id of locking process @@ -140,14 +140,14 @@ public: quint16 dataSize; }; - struct Q_PACKED Block + struct Block { quint16 tag; quint16 pad; quint32 dataSize; }; - struct Q_PACKED Glyph + struct Glyph { quint8 width; quint8 height; |