diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qoutlinemapper.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp index f1e4ce5820..b2d02182c3 100644 --- a/src/gui/painting/qoutlinemapper.cpp +++ b/src/gui/painting/qoutlinemapper.cpp @@ -179,7 +179,7 @@ QT_FT_Outline *QOutlineMapper::convertPath(const QVectorPath &path) m_elements.resize(count); if (count) - memcpy(m_elements.data(), path.points(), count* sizeof(QPointF)); + memcpy(static_cast<void *>(m_elements.data()), static_cast<const void *>(path.points()), count* sizeof(QPointF)); m_element_types.resize(0); } diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index ec1b4c1310..b992e8f55d 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); |