From 964ccc58534aac436529007000d1c38d76c88834 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Mon, 13 Apr 2015 16:06:57 +0200
Subject: Remove separate SSE4 unpremultiply function

Merges the SSE4 specific unpremultiply with the normal version, and
adds a SSE2 fallback. There was no reason to split the two since
compile time options will ensure the right version is inlined.

Also adds short-cut for 0 and 255 values.

Change-Id: Ie5aa262f6964219fd3062d4a498f697cf79a4595
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/gui/image/qimage_sse4.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/gui/image/qimage_sse4.cpp')

diff --git a/src/gui/image/qimage_sse4.cpp b/src/gui/image/qimage_sse4.cpp
index 5fad4f572a..fb63f5bff9 100644
--- a/src/gui/image/qimage_sse4.cpp
+++ b/src/gui/image/qimage_sse4.cpp
@@ -33,7 +33,6 @@
 
 #include <qimage.h>
 #include <private/qdrawhelper_p.h>
-#include <private/qdrawingprimitive_sse2_p.h>
 #include <private/qimage_p.h>
 #include <private/qsimd_p.h>
 
@@ -45,7 +44,7 @@ const uint *QT_FASTCALL convertRGB32FromARGB32PM_sse4(uint *buffer, const uint *
                                                       const QPixelLayout *, const QRgb *)
 {
     for (int i = 0; i < count; ++i)
-        buffer[i] = 0xff000000 | qUnpremultiply_sse4(src[i]);
+        buffer[i] = 0xff000000 | qUnpremultiply(src[i]);
     return buffer;
 }
 
-- 
cgit v1.2.3