summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-23 07:18:39 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-23 10:29:37 +0200
commit5cfb80a28ef6bf6820c970a6c355e6879021e46e (patch)
treee60f1f43e9670e82923e3c2d0d19b29198b9c300 /src/gui/painting
parent930e750b7aca024b839c9856cfcc79aab8c0abbc (diff)
parentf4be16e1f7828a0f6992ef2e20b9106177d7fc88 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/angle/src/libGLESv2/libGLESv2.pro src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp Change-Id: If8da4cfe8f57fea9f78e7239f378a6302c01674e
Diffstat (limited to 'src/gui/painting')
-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 00036f9994..d21765bcde 100644
--- a/src/gui/painting/qblendfunctions_p.h
+++ b/src/gui/painting/qblendfunctions_p.h
@@ -140,7 +140,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--) {