diff options
Diffstat (limited to 'src/gui/text')
-rw-r--r-- | src/gui/text/qfontengine_qpa.cpp | 2 | ||||
-rw-r--r-- | src/gui/text/qfontengine_qpf.cpp | 2 | ||||
-rw-r--r-- | src/gui/text/qfontenginedirectwrite.cpp | 4 | ||||
-rw-r--r-- | src/gui/text/qglyphrun.cpp | 4 | ||||
-rw-r--r-- | src/gui/text/qrawfont.cpp | 2 | ||||
-rw-r--r-- | src/gui/text/qtextengine.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp index d12e2d651cc..bf0cfd14043 100644 --- a/src/gui/text/qfontengine_qpa.cpp +++ b/src/gui/text/qfontengine_qpa.cpp @@ -612,7 +612,7 @@ void QPAGenerator::writeGMap() const int numBytes = glyphCount * sizeof(quint32); qint64 pos = buffer.size(); buffer.resize(pos + numBytes); - qMemSet(buffer.data() + pos, 0xff, numBytes); + memset(buffer.data() + pos, 0xff, numBytes); dev->seek(pos + numBytes); } diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp index 64596ebaf5e..23f263b0bd1 100644 --- a/src/gui/text/qfontengine_qpf.cpp +++ b/src/gui/text/qfontengine_qpf.cpp @@ -1120,7 +1120,7 @@ void QPFGenerator::writeGMap() const int numBytes = glyphCount * sizeof(quint32); qint64 pos = buffer.size(); buffer.resize(pos + numBytes); - qMemSet(buffer.data() + pos, 0xff, numBytes); + memset(buffer.data() + pos, 0xff, numBytes); dev->seek(pos + numBytes); } diff --git a/src/gui/text/qfontenginedirectwrite.cpp b/src/gui/text/qfontenginedirectwrite.cpp index 0f21ae8a1ea..4843d7f12e6 100644 --- a/src/gui/text/qfontenginedirectwrite.cpp +++ b/src/gui/text/qfontenginedirectwrite.cpp @@ -247,7 +247,7 @@ bool QFontEngineDirectWrite::getSfntTableData(uint tag, uchar *buffer, uint *len return false; } - qMemCopy(buffer, tableData, tableSize); + memcpy(buffer, tableData, tableSize); m_directWriteFontFace->ReleaseFontTable(tableContext); return true; @@ -597,7 +597,7 @@ QImage QFontEngineDirectWrite::imageForGlyph(glyph_t t, int size = width * height * 3; if (size > 0) { BYTE *alphaValues = new BYTE[size]; - qMemSet(alphaValues, size, 0); + memset(alphaValues, size, 0); hr = glyphAnalysis->CreateAlphaTexture(DWRITE_TEXTURE_CLEARTYPE_3x1, &rect, diff --git a/src/gui/text/qglyphrun.cpp b/src/gui/text/qglyphrun.cpp index 813e0a804aa..673dd8f03ba 100644 --- a/src/gui/text/qglyphrun.cpp +++ b/src/gui/text/qglyphrun.cpp @@ -221,7 +221,7 @@ QVector<quint32> QGlyphRun::glyphIndexes() const return d->glyphIndexes; } else { QVector<quint32> indexes(d->glyphIndexDataSize); - qMemCopy(indexes.data(), d->glyphIndexData, d->glyphIndexDataSize * sizeof(quint32)); + memcpy(indexes.data(), d->glyphIndexData, d->glyphIndexDataSize * sizeof(quint32)); return indexes; } } @@ -247,7 +247,7 @@ QVector<QPointF> QGlyphRun::positions() const return d->glyphPositions; } else { QVector<QPointF> glyphPositions(d->glyphPositionDataSize); - qMemCopy(glyphPositions.data(), d->glyphPositionData, + memcpy(glyphPositions.data(), d->glyphPositionData, d->glyphPositionDataSize * sizeof(QPointF)); return glyphPositions; } diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp index 5cdd563a33e..3bd4d888723 100644 --- a/src/gui/text/qrawfont.cpp +++ b/src/gui/text/qrawfont.cpp @@ -504,7 +504,7 @@ QVector<QPointF> QRawFont::advancesForGlyphIndexes(const QVector<quint32> &glyph int numGlyphs = glyphIndexes.size(); QVarLengthGlyphLayoutArray glyphs(numGlyphs); - qMemCopy(glyphs.glyphs, glyphIndexes.data(), numGlyphs * sizeof(quint32)); + memcpy(glyphs.glyphs, glyphIndexes.data(), numGlyphs * sizeof(quint32)); d->fontEngine->recalcAdvances(&glyphs, 0); diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 7d366275a35..c5c6b2e621a 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1000,7 +1000,7 @@ void QTextEngine::shapeTextWithHarfbuzz(int item) const kerningEnabled = this->font(si).d->kerning; HB_ShaperItem entire_shaper_item; - qMemSet(&entire_shaper_item, 0, sizeof(entire_shaper_item)); + memset(&entire_shaper_item, 0, sizeof(entire_shaper_item)); entire_shaper_item.string = reinterpret_cast<const HB_UChar16 *>(layoutData->string.constData()); entire_shaper_item.stringLength = layoutData->string.length(); entire_shaper_item.item.script = (HB_Script)si.analysis.script; |