summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-06-22 15:39:21 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-06-22 16:09:12 +0000
commitf968bd665eb16d983a536dd61b27b8885457f574 (patch)
tree199c6f9a529eeede8057adda12cb7a3352c12431 /src
parent1d034244c261520d5e739534dc264c2500e02b5f (diff)
Fix regression in simple RGB16->RGB16 scaling
The fix for QTBUG-35927 introduced a too strict check when scaling from a 16-bit source to a 16-bit destination. This patch changes the limit to adjust to source type. Task-number: QTBUG-54281 Change-Id: I6dd2bb8308f77520c00fa3ef6643a42462c5d351 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/gui/painting/qblendfunctions_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qblendfunctions_p.h b/src/gui/painting/qblendfunctions_p.h
index 4435421cd0..a069f89db7 100644
--- a/src/gui/painting/qblendfunctions_p.h
+++ b/src/gui/painting/qblendfunctions_p.h
@@ -134,7 +134,7 @@ void qt_scale_image_16bit(uchar *destPixels, int dbpl,
if (yend < 0 || yend >= srch)
--h;
int xend = (basex + ix * (w - 1)) >> 16;
- if (xend < 0 || xend >= (int)(sbpl/sizeof(quint32)))
+ if (xend < 0 || xend >= (int)(sbpl/sizeof(SRC)))
--w;
while (h--) {