From d761982b51dec1d6ae3b0295818e7d65f826de95 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 1 Apr 2020 21:08:48 +0000 Subject: [PATCH] assume x and y are always zero in qt_rectconvert() Signed-off-by: Ivailo Monev --- src/gui/image/qimage.cpp | 2 +- src/gui/painting/qdrawhelper_p.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index ec8fbd5a1..7b08903f5 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -2682,7 +2682,7 @@ static void convert_Mono_to_Indexed8(QImageData *dest, const QImageData *src, Qt { \ qt_rectconvert(reinterpret_cast(dest->data), \ reinterpret_cast(src->data), \ - 0, 0, src->width, src->height, \ + src->width, src->height, \ dest->bytes_per_line, src->bytes_per_line); \ } diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index 033c0414c..83ec47587 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -1558,10 +1558,10 @@ inline void qt_memconvert(qrgb666 *dest, const quint32 *src, int count) template inline void qt_rectconvert(DST *dest, const SRC *src, - int x, int y, int width, int height, + int width, int height, int dstStride, int srcStride) { - char *d = (char*)(dest + x) + y * dstStride; + char *d = (char*)dest; const char *s = (const char*)(src); for (int i = 0; i < height; ++i) { qt_memconvert((DST*)d, (const SRC*)s, width); @@ -1573,10 +1573,10 @@ inline void qt_rectconvert(DST *dest, const SRC *src, #define QT_RECTCONVERT_TRIVIAL_IMPL(T) \ template <> \ inline void qt_rectconvert(T *dest, const T *src, \ - int x, int y, int width, int height, \ + int width, int height, \ int dstStride, int srcStride) \ { \ - char *d = (char*)(dest + x) + y * dstStride; \ + char *d = (char*)dest; \ const char *s = (const char*)(src); \ for (int i = 0; i < height; ++i) { \ ::memcpy(d, s, width * sizeof(T)); \