From f98b7ce1edeb68cd73b4e4b8a288d66d0ed9fa97 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 18 Dec 2016 00:09:11 -0400 Subject: [PATCH] Fix ImageData:paste. --HG-- branch : minor --- src/modules/image/ImageData.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/image/ImageData.cpp b/src/modules/image/ImageData.cpp index 60c222511..7b21d8e3a 100644 --- a/src/modules/image/ImageData.cpp +++ b/src/modules/image/ImageData.cpp @@ -160,7 +160,11 @@ void ImageData::paste(ImageData *src, int dx, int dy, int sx, int sy, int sw, in { // Otherwise, copy each row individually. for (int i = 0; i < sh; i++) - memcpy(d + dx + (i + dy) * getWidth(), s + (sx + (i + sy) * src->getWidth()) * pixelsize, pixelsize * sw); + { + const uint8 *rowsrc = s + (sx + (i + sy) * src->getWidth()) * pixelsize; + uint8 *rowdst = d + (dx + (i + dy) * getWidth()) * pixelsize; + memcpy(rowdst, rowsrc, pixelsize * sw); + } } }