diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-23 13:23:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-23 14:24:55 +0200 |
| commit | dd90af122154af8ba8cba16c8760c3d2a1d0fcab (patch) | |
| tree | 08dc64d9960346c4b27f42c7e58ef9d8885ac760 /src/gui/painting | |
| parent | b24396b925c78a59ef4a59d69a6b2633887aaf2f (diff) | |
| parent | 5cfb80a28ef6bf6820c970a6c355e6879021e46e (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
mkspecs/common/mac.conf
mkspecs/features/configure_base.prf
mkspecs/features/configure.prf
mkspecs/macx-clang-32/qmake.conf
mkspecs/macx-clang/qmake.conf
mkspecs/macx-ios-clang/qmake.conf
src/network/ssl/qsslsocket_openssl_symbols_p.h
Change-Id: I768b592e8e589662b1fdb9b8cbd633fef26845b6
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qblendfunctions_p.h | 2 |
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--) { |