diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-05 16:47:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-08-05 16:47:13 +0200 |
| commit | b53e08e3356528e7d240188c8985e205a6eaa2a2 (patch) | |
| tree | 96936333023c58e0eb585efcc55be0ba787aa047 /src/gui/painting | |
| parent | c48484ea6d39909b7919577701ffeb9656bbea62 (diff) | |
| parent | 0936bc54f907066644503c7d4c390968711c73a7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qblendfunctions_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qblendfunctions_p.h b/src/gui/painting/qblendfunctions_p.h index 98e9e10bd8..e08c74ab88 100644 --- a/src/gui/painting/qblendfunctions_p.h +++ b/src/gui/painting/qblendfunctions_p.h @@ -147,7 +147,7 @@ void qt_scale_image_16bit(uchar *destPixels, int dbpl, while (h--) { const SRC *src = (const SRC *) (srcPixels + (srcy >> 16) * sbpl); - int srcx = basex; + quint32 srcx = basex; int x = 0; for (; x<w-7; x+=8) { blender.write(&dst[x], src[srcx >> 16]); srcx += ix; @@ -258,7 +258,7 @@ template <typename T> void qt_scale_image_32bit(uchar *destPixels, int dbpl, while (h--) { const uint *src = (const quint32 *) (srcPixels + (srcy >> 16) * sbpl); - int srcx = basex; + quint32 srcx = basex; int x = 0; for (; x<w; ++x) { blender.write(&dst[x], src[srcx >> 16]); |