Changeset 32878 in webkit

Timestamp:

May 5, 2008 11:26:17 AM (16 years ago)

Author:

hyatt@apple.com

Message:

WebCore:

2008-05-05 David Hyatt <​hyatt@apple.com>

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=18821. Fix some bugs in both get/PutImageData of <canvas>.

Reviewed by Eric

New tests added in fast/canvas/

• platform/graphics/cg/ImageBufferCG.cpp: (WebCore::ImageBuffer::getImageData): (WebCore::ImageBuffer::putImageData):

LayoutTests:

2008-05-05 David Hyatt <​hyatt@apple.com>

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=18821, putImageData incorrect when data has alpha.

Reviewed by Eric

• fast/canvas/canvas-alphaImageData-behavior-expected.txt: Added.
• fast/canvas/canvas-alphaImageData-behavior.html: Added.
• fast/canvas/canvas-alphaImageData-behavior.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-alphaImageData-behavior-expected.txt (added)
• LayoutTests/fast/canvas/canvas-alphaImageData-behavior.html (added)
• LayoutTests/fast/canvas/canvas-alphaImageData-behavior.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/cg/ImageBufferCG.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-05-05  David Hyatt  <hyatt@apple.com>
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=18821, putImageData incorrect when data has alpha.
+
+        Reviewed by Eric
+
+        * fast/canvas/canvas-alphaImageData-behavior-expected.txt: Added.
+        * fast/canvas/canvas-alphaImageData-behavior.html: Added.
+        * fast/canvas/canvas-alphaImageData-behavior.js: Added.
+
 2008-05-05  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-05-05  David Hyatt  <hyatt@apple.com>
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=18821.  Fix some bugs in both get/PutImageData of <canvas>.
+
+        Reviewed by Eric
+
+        New tests added in fast/canvas/
+
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::ImageBuffer::getImageData):
+        (WebCore::ImageBuffer::putImageData):
+
 2008-05-05  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -150 +150 @@
             int basex = x * 4;
             if (unsigned char alpha = srcRows[basex + 3]) {
-                destRows[0] = (srcRows[basex] * 255) / alpha;
-                destRows[1] = (srcRows[basex + 1] * 255) / alpha;
-                destRows[2] = (srcRows[basex + 2] * 255) / alpha;
-                destRows[3] = alpha;
+                destRows[basex] = (srcRows[basex] * 255) / alpha;
+                destRows[basex + 1] = (srcRows[basex + 1] * 255) / alpha;
+                destRows[basex + 2] = (srcRows[basex + 2] * 255) / alpha;
+                destRows[basex + 3] = alpha;
             } else {
-                reinterpret_cast<uint32_t*>(destRows)[0] = reinterpret_cast<uint32_t*>(srcRows)[0];
+                reinterpret_cast<uint32_t*>(destRows + basex)[0] = reinterpret_cast<uint32_t*>(srcRows + basex)[0];
             }
-            destRows += 4;
         }
         srcRows += srcBytesPerRow;
+        destRows += destBytesPerRow;
     }
     return result;
@@ -199 +199 @@
     for (int y = 0; y < numRows; ++y) {
         for (int x = 0; x < numColumns; x++) {
-            unsigned char alpha = srcRows[x * 4 + 3];
+            int basex = x * 4;
+            unsigned char alpha = srcRows[basex + 3];
             if (alpha != 255) {
-                destRows[x * 4 + 0] = (srcRows[0] * alpha) / 255;
-                destRows[x * 4 + 1] = (srcRows[1] * alpha) / 255;
-                destRows[x * 4 + 2] = (srcRows[2] * alpha) / 255;
-                destRows[x * 4 + 3] = alpha;
+                destRows[basex] = (srcRows[basex] * alpha + 254) / 255;
+                destRows[basex + 1] = (srcRows[basex + 1] * alpha + 254) / 255;
+                destRows[basex + 2] = (srcRows[basex + 2] * alpha + 254) / 255;
+                destRows[basex + 3] = alpha;
             } else {
-                reinterpret_cast<uint32_t*>(destRows + x * 4)[0] = reinterpret_cast<uint32_t*>(srcRows + x * 4)[0];
+                reinterpret_cast<uint32_t*>(destRows + basex)[0] = reinterpret_cast<uint32_t*>(srcRows + basex)[0];
             }
         }