Changeset 64202 in webkit

Timestamp:

Jul 28, 2010 5:55:25 AM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-07-28 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] putImageData(): Combine premultiplication and BGR->RGB
​https://bugs.webkit.org/show_bug.cgi?id=43114

Further optimized putImageData() by doing BGR->RGB inside the
premultiplication routine.

• platform/graphics/qt/ImageBufferQt.cpp: (WebCore::premultiplyABGRtoARGB): Renamed from premultiply. (WebCore::putImageData):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ImageBufferQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-28  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] putImageData(): Combine premultiplication and BGR->RGB
+        https://bugs.webkit.org/show_bug.cgi?id=43114
+
+        Further optimized putImageData() by doing BGR->RGB inside the
+        premultiplication routine.
+
+        * platform/graphics/qt/ImageBufferQt.cpp:
+        (WebCore::premultiplyABGRtoARGB): Renamed from premultiply.
+        (WebCore::putImageData):
+
 2010-07-28  Andrei Popescu  <andreip@google.com>
 

trunk/WebCore/platform/graphics/qt/ImageBufferQt.cpp

@@ -238 +238 @@
 }
 
-static inline unsigned int premultiply(unsigned int x)
+static inline unsigned int premultiplyABGRtoARGB(unsigned int x)
 {
     unsigned int a = x >> 24;
     if (a == 255)
-        return x;
+        return (x << 16) | ((x >> 16) & 0xff) | (x & 0xff00ff00);
     unsigned int t = (x & 0xff00ff) * a;
     t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8;
-    t &= 0xff00ff;
+    t = ((t << 16) | (t >> 16)) & 0xff00ff;
 
     x = ((x >> 8) & 0xff) * a;
@@ -298 +298 @@
                 // Premultiply and convert BGR to RGB.
                 quint32 pixel = srcScanLine[x];
-                destScanLine[x] = premultiply(((pixel << 16) & 0xff0000) | ((pixel >> 16) & 0xff) | (pixel & 0xff00ff00));
+                destScanLine[x] = premultiplyABGRtoARGB(pixel);
             }
             srcScanLine += source->width();