Fix the build when NEON_INTRINSICS is enabled
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Mar 2015 23:56:25 +0000 (23:56 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Mar 2015 23:56:25 +0000 (23:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=142361

Patch by Sandy Perez <sperez@indaba.es> on 2015-03-05
Reviewed by Csaba Osztrogon√°c.

* platform/graphics/cpu/arm/filters/FEBlendNEON.h:
(WebCore::FEBlend::platformApplySoftware):
* platform/graphics/filters/FEGaussianBlur.cpp:
(WebCore::standardBoxBlur):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181110 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/cpu/arm/filters/FEBlendNEON.h
Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp

index 4ee154f..52f2422 100644 (file)
@@ -1,3 +1,15 @@
+2015-03-05  Sandy Perez  <sperez@indaba.es>
+
+        Fix the build when NEON_INTRINSICS is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=142361
+
+        Reviewed by Csaba Osztrogon√°c.
+
+        * platform/graphics/cpu/arm/filters/FEBlendNEON.h:
+        (WebCore::FEBlend::platformApplySoftware):
+        * platform/graphics/filters/FEGaussianBlur.cpp:
+        (WebCore::standardBoxBlur):
+
 2015-03-05  Benjamin Poulain  <bpoulain@apple.com>
 
         Add basic support for character sets to the URL Filter parser
index 91b72a3..50ec879 100644 (file)
@@ -126,7 +126,7 @@ void FEBlend::platformApplySoftware()
 
     if (pixelArrayLength >= 8) {
         platformApplyNEON(srcPixelArrayA->data(), srcPixelArrayB->data(), dstPixelArray->data(), pixelArrayLength);
-        return
+        return;
     }
     // If there is just one pixel we expand it to two.
     ASSERT(pixelArrayLength > 0);
index 85bca74..3e3cf24 100644 (file)
@@ -345,7 +345,7 @@ inline void standardBoxBlur(Uint8ClampedArray* src, Uint8ClampedArray* dst, unsi
         if (kernelSizeX) {
             kernelPosition(i, kernelSizeX, dxLeft, dxRight);
 #if HAVE(ARM_NEON_INTRINSICS)
-            if (!isAlphaImage())
+            if (!isAlphaImage)
                 boxBlurNEON(src, dst, kernelSizeX, dxLeft, dxRight, 4, stride, paintSize.width(), paintSize.height());
             else
                 boxBlur(src, dst, kernelSizeX, dxLeft, dxRight, 4, stride, paintSize.width(), paintSize.height(), true, edgeMode);
@@ -358,7 +358,7 @@ inline void standardBoxBlur(Uint8ClampedArray* src, Uint8ClampedArray* dst, unsi
         if (kernelSizeY) {
             kernelPosition(i, kernelSizeY, dyLeft, dyRight);
 #if HAVE(ARM_NEON_INTRINSICS)
-            if (!isAlphaImage())
+            if (!isAlphaImage)
                 boxBlurNEON(src, dst, kernelSizeY, dyLeft, dyRight, stride, 4, paintSize.height(), paintSize.width());
             else
                 boxBlur(src, dst, kernelSizeY, dyLeft, dyRight, stride, 4, paintSize.height(), paintSize.width(), true, edgeMode);