summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authorJohn Brooks <special@dereferenced.net>2010-07-05 19:17:49 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-07-07 09:57:10 (GMT)
commitdad8e33546a209820da1f3d07a0e331e001bc23e (patch)
tree4312cf786a880196e9658df45ee7b1826fbbaa1f /src/gui/painting
parent93bcbe213e947843184a75f4b237c8dff45ca866 (diff)
downloadQt-dad8e33546a209820da1f3d07a0e331e001bc23e.zip
Qt-dad8e33546a209820da1f3d07a0e331e001bc23e.tar.gz
Qt-dad8e33546a209820da1f3d07a0e331e001bc23e.tar.bz2
SSE2 implementation of convert_ARGB_to_ARGB_PM_inplace for QImage
Merge-request: 725 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qdrawhelper_sse2.cpp12
-rw-r--r--src/gui/painting/qdrawingprimitive_sse2_p.h6
2 files changed, 8 insertions, 10 deletions
diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp
index ae16fed..346e177 100644
--- a/src/gui/painting/qdrawhelper_sse2.cpp
+++ b/src/gui/painting/qdrawhelper_sse2.cpp
@@ -43,18 +43,10 @@
#ifdef QT_HAVE_SSE2
+#include <private/qsimd_p.h>
+#include <private/qdrawingprimitive_sse2_p.h>
#include <private/qpaintengine_raster_p.h>
-#ifdef QT_LINUXBASE
-// this is an evil hack - the posix_memalign declaration in LSB
-// is wrong - see http://bugs.linuxbase.org/show_bug.cgi?id=2431
-# define posix_memalign _lsb_hack_posix_memalign
-# include <emmintrin.h>
-# undef posix_memalign
-#else
-# include <emmintrin.h>
-#endif
-
QT_BEGIN_NAMESPACE
void qt_blend_argb32_on_argb32_sse2(uchar *destPixels, int dbpl,
diff --git a/src/gui/painting/qdrawingprimitive_sse2_p.h b/src/gui/painting/qdrawingprimitive_sse2_p.h
index 2b595c5..3c96946 100644
--- a/src/gui/painting/qdrawingprimitive_sse2_p.h
+++ b/src/gui/painting/qdrawingprimitive_sse2_p.h
@@ -42,6 +42,10 @@
#ifndef QDRAWINGPRIMITIVE_SSE2_P_H
#define QDRAWINGPRIMITIVE_SSE2_P_H
+#include <private/qsimd_p.h>
+
+#ifdef QT_HAVE_SSE2
+
//
// W A R N I N G
// -------------
@@ -213,4 +217,6 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
+#endif // QT_HAVE_SSE2
+
#endif // QDRAWINGPRIMITIVE_SSE2_P_H