diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-09 16:05:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-09 16:05:13 (GMT) |
| commit | 7190c7be34fe0dbcfbb10b232b40977c758d251a (patch) | |
| tree | 6c94506f0b47c5e634128e6dc34204bd3ea9da07 /src/gui/painting | |
| parent | f6f2d03b2d74b236d33a5ca32a49f138bf521c13 (diff) | |
| parent | d9c84c26dc212b2f170dfb48346df7c439e6f759 (diff) | |
| download | Qt-7190c7be34fe0dbcfbb10b232b40977c758d251a.zip Qt-7190c7be34fe0dbcfbb10b232b40977c758d251a.tar.gz Qt-7190c7be34fe0dbcfbb10b232b40977c758d251a.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qdrawhelper_neon.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/painting/qdrawhelper_neon.cpp b/src/gui/painting/qdrawhelper_neon.cpp index 00b103d..debca37 100644 --- a/src/gui/painting/qdrawhelper_neon.cpp +++ b/src/gui/painting/qdrawhelper_neon.cpp @@ -327,10 +327,8 @@ void qt_blend_argb32_on_rgb16_neon(uchar *destPixels, int dbpl, blend_8_pixels_argb32_on_rgb16_neon(dstBuffer, srcBuffer, const_alpha); - for (int j = 0; j < tail; ++j) { + for (int j = 0; j < tail; ++j) dst[i + j] = dstBuffer[j]; - src[i + j] = srcBuffer[j]; - } } dst = (quint16 *)(((uchar *) dst) + dbpl); |