From: Ivailo Monev Date: Fri, 16 Oct 2020 13:51:31 +0000 (+0300) Subject: rename qt_fetchUntransformed() for consistency X-Git-Tag: 4.12.0~3482 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b432d0b547c9491323b39d1c64cfe0b1f81c8ffc;p=kde%2FKatie.git rename qt_fetchUntransformed() for consistency Signed-off-by: Ivailo Monev --- diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index bc0ebbd89..78136ad33 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -366,7 +366,7 @@ enum TextureBlendType { }; template -static const uint * QT_FASTCALL qt_fetchUntransformed(uint *buffer, const Operator *, const QSpanData *data, +static const uint * QT_FASTCALL fetchUntransformed(uint *buffer, const Operator *, const QSpanData *data, int y, int x, int length) { const uchar *scanLine = data->texture.scanLine(y); @@ -377,7 +377,7 @@ static const uint * QT_FASTCALL qt_fetchUntransformed(uint *buffer, const Operat template <> const uint * QT_FASTCALL -qt_fetchUntransformed(uint *, const Operator *, +fetchUntransformed(uint *, const Operator *, const QSpanData *data, int y, int x, int) { @@ -540,24 +540,24 @@ static const SourceFetchProc sourceFetch[NBlendTypes][QImage::NImageFormats] = { // Untransformed { 0, // Invalid - qt_fetchUntransformed, // Mono - qt_fetchUntransformed, // MonoLsb - qt_fetchUntransformed, // Indexed8 - qt_fetchUntransformed, // RGB32 - qt_fetchUntransformed, // ARGB32 - qt_fetchUntransformed, // ARGB32_Premultiplied - qt_fetchUntransformed // RGB16 + fetchUntransformed, // Mono + fetchUntransformed, // MonoLsb + fetchUntransformed, // Indexed8 + fetchUntransformed, // RGB32 + fetchUntransformed, // ARGB32 + fetchUntransformed, // ARGB32_Premultiplied + fetchUntransformed // RGB16 }, // Tiled { 0, // Invalid - qt_fetchUntransformed, // Mono - qt_fetchUntransformed, // MonoLsb - qt_fetchUntransformed, // Indexed8 - qt_fetchUntransformed, // RGB32 - qt_fetchUntransformed, // ARGB32 - qt_fetchUntransformed, // ARGB32_Premultiplied - qt_fetchUntransformed // RGB16 + fetchUntransformed, // Mono + fetchUntransformed, // MonoLsb + fetchUntransformed, // Indexed8 + fetchUntransformed, // RGB32 + fetchUntransformed, // ARGB32 + fetchUntransformed, // ARGB32_Premultiplied + fetchUntransformed // RGB16 }, // Transformed {