Changeset 187545 in webkit

Timestamp:

Jul 29, 2015, 5:35:31 AM (11 years ago)

Author:

dino@apple.com

Message:

Remove dispatch_apply_f and instead use vImage more directly
​https://bugs.webkit.org/show_bug.cgi?id=147391
<rdar://problem/21893047>

Fix the iOS builds.

• platform/graphics/cg/ImageBufferDataCG.cpp:

(WebCore::unpremultiplyBufferData):
(WebCore::premultiplyBufferData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/ImageBufferDataCG.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-29  Dean Jackson  <dino@apple.com>
+
+        Remove dispatch_apply_f and instead use vImage more directly
+        https://bugs.webkit.org/show_bug.cgi?id=147391
+        <rdar://problem/21893047>
+
+        Fix the iOS builds.
+
+        * platform/graphics/cg/ImageBufferDataCG.cpp:
+        (WebCore::unpremultiplyBufferData):
+        (WebCore::premultiplyBufferData):
+
 2015-07-29  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp

@@ -58 +58 @@
 #if USE(ACCELERATE)
 #if USE_ARGB32 || USE(IOSURFACE_CANVAS_BACKING_STORE)
+static void unpremultiplyBufferData(const vImage_Buffer& src, const vImage_Buffer& dest)
+{
+    ASSERT(src.data);
+    ASSERT(dest.data);
+
+    if (kvImageNoError != vImageUnpremultiplyData_RGBA8888(&src, &dest, kvImageNoFlags))
+        return;
+
+    // Swap channels 1 and 3, to convert BGRA<->RGBA. IOSurfaces are BGRA, ImageData expects RGBA.
+    const uint8_t map[4] = { 2, 1, 0, 3 };
+    vImagePermuteChannels_ARGB8888(&dest, &dest, map, kvImageNoFlags);
+}
+
+#if !PLATFORM(IOS_SIMULATOR)
 static void premultiplyBufferData(const vImage_Buffer& src, const vImage_Buffer& dest)
 {
@@ -70 +84 @@
     vImagePermuteChannels_ARGB8888(&dest, &dest, map, kvImageNoFlags);
 }
-
-static void unpremultiplyBufferData(const vImage_Buffer& src, const vImage_Buffer& dest)
-{
-    ASSERT(src.data);
-    ASSERT(dest.data);
-
-    if (kvImageNoError != vImageUnpremultiplyData_RGBA8888(&src, &dest, kvImageNoFlags))
-        return;
-
-    // Swap channels 1 and 3, to convert BGRA<->RGBA. IOSurfaces are BGRA, ImageData expects RGBA.
-    const uint8_t map[4] = { 2, 1, 0, 3 };
-    vImagePermuteChannels_ARGB8888(&dest, &dest, map, kvImageNoFlags);
-}
+#endif // !PLATFORM(IOS_SIMULATOR)
 #endif // USE_ARGB32 || USE(IOSURFACE_CANVAS_BACKING_STORE)
 
+#if !PLATFORM(IOS_SIMULATOR)
 static void affineWarpBufferData(const vImage_Buffer& src, const vImage_Buffer& dest, float scale)
 {
@@ -91 +94 @@
     vImageAffineWarp_ARGB8888(&src, &dest, 0, &scaleTransform, backgroundColor, kvImageEdgeExtend);
 }
-
+#endif // !PLATFORM(IOS_SIMULATOR)
 #endif // USE(ACCELERATE)