diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-02-27 14:58:13 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-11-19 15:42:24 +0000 |
| commit | a49d339fdfb38ef58f2ccb9917f9aad6f63ff1ed (patch) | |
| tree | 4ccbe1ed8c49179b1107a542de28af0eccd41651 | |
| parent | 8b9a771ec0b70822f4a34d289459d3e60b9510ce (diff) | |
Silence a GCC 8 warning in qpainter
qtbase/src/gui/painting/qpainter.cpp:5625:68: error: ‘void* memset(void*, int, size_t)’ clearing an object of non-trivial type ‘struct QFixed’; use assignment or value-initialization instead [-Werror=class-memaccess]
memset(advances.data(), 0, advances.size() * sizeof(QFixed));
Change-Id: I563b1b0c5dfaf381a9521bc9a4dc3197f0f38d11
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit 71cdc95006871a338ec2c0b869299980cef2776e)
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 49d8fd2846..2ce0f3cb79 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -5622,8 +5622,8 @@ void QPainterPrivate::drawGlyphs(const quint32 *glyphArray, QFixedPoint *positio QVarLengthArray<QGlyphJustification, 128> glyphJustifications(glyphCount); QVarLengthArray<QGlyphAttributes, 128> glyphAttributes(glyphCount); memset(glyphAttributes.data(), 0, glyphAttributes.size() * sizeof(QGlyphAttributes)); - memset(advances.data(), 0, advances.size() * sizeof(QFixed)); - memset(glyphJustifications.data(), 0, glyphJustifications.size() * sizeof(QGlyphJustification)); + memset(static_cast<void *>(advances.data()), 0, advances.size() * sizeof(QFixed)); + memset(static_cast<void *>(glyphJustifications.data()), 0, glyphJustifications.size() * sizeof(QGlyphJustification)); textItem.glyphs.numGlyphs = glyphCount; textItem.glyphs.glyphs = const_cast<glyph_t *>(glyphArray); |