From a49d339fdfb38ef58f2ccb9917f9aad6f63ff1ed Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Tue, 27 Feb 2018 14:58:13 +0200 Subject: Silence a GCC 8 warning in qpainter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 71cdc95006871a338ec2c0b869299980cef2776e) Reviewed-by: Ville Voutilainen --- src/gui/painting/qpainter.cpp | 4 ++-- 1 file 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 glyphJustifications(glyphCount); QVarLengthArray 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(advances.data()), 0, advances.size() * sizeof(QFixed)); + memset(static_cast(glyphJustifications.data()), 0, glyphJustifications.size() * sizeof(QGlyphJustification)); textItem.glyphs.numGlyphs = glyphCount; textItem.glyphs.glyphs = const_cast(glyphArray); -- cgit v1.2.3