Changeset 101638 in webkit

Timestamp:

Dec 1, 2011, 1:02:53 AM (15 years ago)

Author:

commit-queue@webkit.org

Message:

SVG Gaussian blur in 1-dimension is incorrect
​https://bugs.webkit.org/show_bug.cgi?id=73029

Patch by Florin Malita <​fmalita@google.com> on 2011-12-01
Reviewed by Simon Fraser.

Source/WebCore:

Ensure that the last blurBox result is stored when applying one-dimensional blurs.

• platform/graphics/filters/FEGaussianBlur.cpp:

(WebCore::FEGaussianBlur::platformApplyGeneric):

LayoutTests:

• platform/chromium-win/svg/filters/feGaussianBlur-expected.png: Rebaseline.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium-win/svg/filters/feGaussianBlur-expected.png (modified) ( previous)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-01  Florin Malita  <fmalita@google.com>
+
+        SVG Gaussian blur in 1-dimension is incorrect
+        https://bugs.webkit.org/show_bug.cgi?id=73029
+
+        Reviewed by Simon Fraser.
+
+        * platform/chromium-win/svg/filters/feGaussianBlur-expected.png: Rebaseline.
+
 2011-12-01  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-01  Florin Malita  <fmalita@google.com>
+
+        SVG Gaussian blur in 1-dimension is incorrect
+        https://bugs.webkit.org/show_bug.cgi?id=73029
+
+        Reviewed by Simon Fraser.
+
+        Ensure that the last blurBox result is stored when applying one-dimensional blurs.
+
+        * platform/graphics/filters/FEGaussianBlur.cpp:
+        (WebCore::FEGaussianBlur::platformApplyGeneric):
+
 2011-12-01  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp

@@ -38 +38 @@
 #include <wtf/ParallelJobs.h>
 
-using std::max;
+using namespace std;
 
 static inline float gaussianKernelFactor()
@@ -89 +89 @@
             int sum = 0;
             // Fill the kernel
-            int maxKernelSize = std::min(dxRight, effectWidth);
+            int maxKernelSize = min(dxRight, effectWidth);
             for (int i = 0; i < maxKernelSize; ++i)
                 sum += srcPixelArray->get(line + i * stride + channel);
@@ -115 +115 @@
     int dyLeft = 0;
     int dyRight = 0;
+    ByteArray* src = srcPixelArray;
+    ByteArray* dst = tmpPixelArray;
+
     for (int i = 0; i < 3; ++i) {
         if (kernelSizeX) {
             kernelPosition(i, kernelSizeX, dxLeft, dxRight);
-            boxBlur(srcPixelArray, tmpPixelArray, kernelSizeX, dxLeft, dxRight, 4, stride, paintSize.width(), paintSize.height(), isAlphaImage());
-        } else {
-            ByteArray* auxPixelArray = tmpPixelArray;
-            tmpPixelArray = srcPixelArray;
-            srcPixelArray = auxPixelArray;
+            boxBlur(src, dst, kernelSizeX, dxLeft, dxRight, 4, stride, paintSize.width(), paintSize.height(), isAlphaImage());
+            swap(src, dst);
         }
 
         if (kernelSizeY) {
             kernelPosition(i, kernelSizeY, dyLeft, dyRight);
-            boxBlur(tmpPixelArray, srcPixelArray, kernelSizeY, dyLeft, dyRight, stride, 4, paintSize.height(), paintSize.width(), isAlphaImage());
-        } else {
-            ByteArray* auxPixelArray = tmpPixelArray;
-            tmpPixelArray = srcPixelArray;
-            srcPixelArray = auxPixelArray;
+            boxBlur(src, dst, kernelSizeY, dyLeft, dyRight, stride, 4, paintSize.height(), paintSize.width(), isAlphaImage());
+            swap(src, dst);
         }
     }
+
+    // The final result should be stored in srcPixelArray.
+    if (dst == srcPixelArray) {
+        ASSERT(src->length() == dst->length());
+        memcpy(dst->data(), src->data(), src->length());
+    }
+
 }