Modified: trunk/Source/WebCore/ChangeLog (164067 => 164068)
--- trunk/Source/WebCore/ChangeLog 2014-02-13 23:33:34 UTC (rev 164067)
+++ trunk/Source/WebCore/ChangeLog 2014-02-13 23:34:35 UTC (rev 164068)
@@ -1,3 +1,12 @@
+2014-02-13 Daniel Bates <[email protected]>
+
+ Fix the ARM build when HAVE_ARM_NEON_INTRINSICS is enabled
+
+ Add !HAVE(ARM_NEON_INTRINSICS)-guard around file-level inline function arithmeticSoftware to
+ avoid an unused function compiler warning when building with ARM Neon intrinsics.
+
+ * platform/graphics/filters/FEComposite.cpp:
+
2014-02-13 Brady Eidson <[email protected]>
IDB: Three tests crash the DatabaseProcess under ~KeyedDecoder
Modified: trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp (164067 => 164068)
--- trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp 2014-02-13 23:33:34 UTC (rev 164067)
+++ trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp 2014-02-13 23:34:35 UTC (rev 164068)
@@ -181,6 +181,7 @@
}
}
+#if !HAVE(ARM_NEON_INTRINSICS)
static inline void arithmeticSoftware(unsigned char* source, unsigned char* destination, int pixelArrayLength, float k1, float k2, float k3, float k4)
{
float upperLimit = std::max(0.0f, k1) + std::max(0.0f, k2) + std::max(0.0f, k3) + k4;
@@ -212,6 +213,7 @@
computeArithmeticPixels<0, 0>(source, destination, pixelArrayLength, k1, k2, k3, k4);
}
}
+#endif
inline void FEComposite::platformArithmeticSoftware(Uint8ClampedArray* source, Uint8ClampedArray* destination,
float k1, float k2, float k3, float k4)
