summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-04-08 09:58:59 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-04-08 10:14:59 (GMT)
commit32372616ed942685c7367d6aee58a7fd3849cc0b (patch)
tree7e3ffed6760430687d3bdccb219ed44226b38433
parent9507cbffb31b5ee4bfd9b4d2584406a2346fb668 (diff)
downloadQt-32372616ed942685c7367d6aee58a7fd3849cc0b.zip
Qt-32372616ed942685c7367d6aee58a7fd3849cc0b.tar.gz
Qt-32372616ed942685c7367d6aee58a7fd3849cc0b.tar.bz2
Let's not write to the source buffer when blending argb32 on rgb16.
Even though we're writing the same values back, we might get a segfault when the source is in read-only memory. Reviewed-by: Kim
-rw-r--r--src/gui/painting/qdrawhelper_neon.cpp4
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);