diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 17:21:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 17:21:34 (GMT) |
| commit | 43c831fb56b9e1cff95b21c210bd85f5b67c99b1 (patch) | |
| tree | ab1fecd8e25f6bc64eac5c0d3279fae6cec42afb | |
| parent | c392cb990ea27e4fa81683b3b2bcae844fad3039 (diff) | |
| parent | 32372616ed942685c7367d6aee58a7fd3849cc0b (diff) | |
| download | Qt-43c831fb56b9e1cff95b21c210bd85f5b67c99b1.zip Qt-43c831fb56b9e1cff95b21c210bd85f5b67c99b1.tar.gz Qt-43c831fb56b9e1cff95b21c210bd85f5b67c99b1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Let's not write to the source buffer when blending argb32 on rgb16.
| -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); |