summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2010-06-22 21:48:54 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-06-23 17:28:49 (GMT)
commit86f375e91c2b1162a75f86c9b8f041ae1d4747de (patch)
tree3a4266abf902227aeece0afe1d1ef58b5113ae4a
parenta922a304ae9115d04f3bbcb3bd13c8e374bb16f1 (diff)
downloadQt-86f375e91c2b1162a75f86c9b8f041ae1d4747de.zip
Qt-86f375e91c2b1162a75f86c9b8f041ae1d4747de.tar.gz
Qt-86f375e91c2b1162a75f86c9b8f041ae1d4747de.tar.bz2
Fix the casts of qdrawhelper_sse2
I did erroneous cast by mistake, the code should ensure the pointer are on 32 bits integers. Reviewed-by: Andreas Kling Reviewed-by: Samuel Rødal
-rw-r--r--src/gui/painting/qdrawhelper_sse2.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp
index 7d542d6..e2a69ec 100644
--- a/src/gui/painting/qdrawhelper_sse2.cpp
+++ b/src/gui/painting/qdrawhelper_sse2.cpp
@@ -219,7 +219,7 @@ void qt_blend_argb32_on_argb32_sse2(uchar *destPixels, int dbpl,
int const_alpha)
{
const quint32 *src = (const quint32 *) srcPixels;
- quint32 *dst = (uint *) destPixels;
+ quint32 *dst = (quint32 *) destPixels;
if (const_alpha == 256) {
const __m128i alphaMask = _mm_set1_epi32(0xff000000);
const __m128i nullVector = _mm_set1_epi32(0);
@@ -261,7 +261,7 @@ void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl,
int const_alpha)
{
const quint32 *src = (const quint32 *) srcPixels;
- quint32 *dst = (uint *) destPixels;
+ quint32 *dst = (quint32 *) destPixels;
if (const_alpha != 256) {
if (const_alpha != 0) {
const __m128i nullVector = _mm_set1_epi32(0);
@@ -303,7 +303,7 @@ void QT_FASTCALL comp_func_SourceOver_sse2(uint *destPixels, const uint *srcPixe
Q_ASSERT(const_alpha < 256);
const quint32 *src = (const quint32 *) srcPixels;
- quint32 *dst = (uint *) destPixels;
+ quint32 *dst = (quint32 *) destPixels;
const __m128i nullVector = _mm_set1_epi32(0);
const __m128i half = _mm_set1_epi16(0x80);
@@ -373,7 +373,7 @@ void QT_FASTCALL comp_func_solid_SourceOver_sse2(uint *destPixels, int length, u
const quint32 minusAlphaOfColor = qAlpha(~color);
int x = 0;
- quint32 *dst = (uint *) destPixels;
+ quint32 *dst = (quint32 *) destPixels;
const __m128i colorVector = _mm_set1_epi32(color);
const __m128i colorMask = _mm_set1_epi32(0x00ff00ff);
const __m128i half = _mm_set1_epi16(0x80);