<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187534] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187534">187534</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-07-28 18:43:58 -0700 (Tue, 28 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove dispatch_apply_f and instead use vImage more directly
https://bugs.webkit.org/show_bug.cgi?id=147391
<rdar://problem/21893047>
Reviewed by Simon Fraser.
Use vImage unmultiplication and premultiplication functions on the
entire ImageBufferData object, rather than getting and setting data on an
line by line using dispatch_apply.
We were seeing some crashes in vImage with the smaller buffer sizes, and
hopefully this will either fix the problem, or give us a better
stack trace to diagnose.
I also did a drive-by change of "dst" to "dest". It was inconsistent throughout
the file.
Convered by the tests in fast/canvas and imported/w3c/canvas
* platform/graphics/cg/ImageBufferDataCG.cpp: Remove the ScanlineData structure. It is
no longer needed.
(WebCore::premultiplyBufferData): New function that calls vImagePremultiplyData_RGBA8888.
(WebCore::unpremultiplyBufferData): New function that calls vImageUnpremultiplyData_RGBA8888.
(WebCore::affineWarpBufferData): Extracting some common code into a function.
(WebCore::ImageBufferData::getData): Use the two new functions as appropriate. Move
some of the code around now that more is shared between the different #if branches.
(WebCore::ImageBufferData::putData):
(WebCore::convertScanline): Deleted.
(WebCore::unpremultitplyScanline): Deleted.
(WebCore::premultitplyScanline): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferDataCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187533 => 187534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-29 01:26:49 UTC (rev 187533)
+++ trunk/Source/WebCore/ChangeLog 2015-07-29 01:43:58 UTC (rev 187534)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-07-28 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>
+
+ Reviewed by Simon Fraser.
+
+ Use vImage unmultiplication and premultiplication functions on the
+ entire ImageBufferData object, rather than getting and setting data on an
+ line by line using dispatch_apply.
+
+ We were seeing some crashes in vImage with the smaller buffer sizes, and
+ hopefully this will either fix the problem, or give us a better
+ stack trace to diagnose.
+
+ I also did a drive-by change of "dst" to "dest". It was inconsistent throughout
+ the file.
+
+ Convered by the tests in fast/canvas and imported/w3c/canvas
+
+ * platform/graphics/cg/ImageBufferDataCG.cpp: Remove the ScanlineData structure. It is
+ no longer needed.
+ (WebCore::premultiplyBufferData): New function that calls vImagePremultiplyData_RGBA8888.
+ (WebCore::unpremultiplyBufferData): New function that calls vImageUnpremultiplyData_RGBA8888.
+ (WebCore::affineWarpBufferData): Extracting some common code into a function.
+ (WebCore::ImageBufferData::getData): Use the two new functions as appropriate. Move
+ some of the code around now that more is shared between the different #if branches.
+ (WebCore::ImageBufferData::putData):
+ (WebCore::convertScanline): Deleted.
+ (WebCore::unpremultitplyScanline): Deleted.
+ (WebCore::premultitplyScanline): Deleted.
+
</ins><span class="cx"> 2015-07-28 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up usesAsyncCallbacks handling in ResourceHandle
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferDataCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp (187533 => 187534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-07-29 01:26:49 UTC (rev 187533)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-07-29 01:43:58 UTC (rev 187534)
</span><span class="lines">@@ -42,16 +42,6 @@
</span><span class="cx"> #include <dispatch/dispatch.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(ACCELERATE)
-struct ScanlineData {
- vImagePixelCount scanlineWidth;
- unsigned char* srcData;
- size_t srcRowBytes;
- unsigned char* destData;
- size_t destRowBytes;
-};
-#endif
-
</del><span class="cx"> // CA uses ARGB32 for textures and ARGB32 -> ARGB32 resampling is optimized.
</span><span class="cx"> #define USE_ARGB32 PLATFORM(IOS)
</span><span class="cx">
</span><span class="lines">@@ -66,47 +56,41 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(ACCELERATE)
</span><del>-
</del><span class="cx"> #if USE_ARGB32 || USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><del>-static void convertScanline(void* data, size_t tileNumber, bool premultiply)
</del><ins>+static void premultiplyBufferData(const vImage_Buffer& src, const vImage_Buffer& dest)
</ins><span class="cx"> {
</span><del>- ScanlineData* scanlineData = static_cast<ScanlineData*>(data);
</del><ins>+ ASSERT(src->data);
+ ASSERT(dest->data);
</ins><span class="cx">
</span><del>- vImage_Buffer src;
- src.data = scanlineData->srcData + tileNumber * scanlineData->srcRowBytes;
- src.height = 1;
- src.width = scanlineData->scanlineWidth;
- src.rowBytes = scanlineData->srcRowBytes;
</del><ins>+ if (kvImageNoError != vImagePremultiplyData_RGBA8888(&src, &dest, kvImageNoFlags))
+ return;
</ins><span class="cx">
</span><del>- vImage_Buffer dest;
- dest.data = scanlineData->destData + tileNumber * scanlineData->destRowBytes;
- dest.height = 1;
- dest.width = scanlineData->scanlineWidth;
- dest.rowBytes = scanlineData->destRowBytes;
-
- if (premultiply) {
- if (kvImageNoError != vImagePremultiplyData_RGBA8888(&src, &dest, kvImageDoNotTile))
- return;
- } else {
- if (kvImageNoError != vImageUnpremultiplyData_RGBA8888(&src, &dest, kvImageDoNotTile))
- return;
- }
-
</del><span class="cx"> // Swap channels 1 and 3, to convert BGRA<->RGBA. IOSurfaces are BGRA, ImageData expects RGBA.
</span><span class="cx"> const uint8_t map[4] = { 2, 1, 0, 3 };
</span><del>- vImagePermuteChannels_ARGB8888(&dest, &dest, map, kvImageDoNotTile);
</del><ins>+ vImagePermuteChannels_ARGB8888(&dest, &dest, map, kvImageNoFlags);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void unpremultitplyScanline(void* data, size_t tileNumber)
</del><ins>+static void unpremultiplyBufferData(const vImage_Buffer& src, const vImage_Buffer& dest)
</ins><span class="cx"> {
</span><del>- convertScanline(data, tileNumber, false);
</del><ins>+ 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);
</ins><span class="cx"> }
</span><ins>+#endif // USE_ARGB32 || USE(IOSURFACE_CANVAS_BACKING_STORE)
</ins><span class="cx">
</span><del>-static void premultitplyScanline(void* data, size_t tileNumber)
</del><ins>+static void affineWarpBufferData(const vImage_Buffer& src, const vImage_Buffer& dest, float scale)
</ins><span class="cx"> {
</span><del>- convertScanline(data, tileNumber, true);
</del><ins>+ vImage_AffineTransform scaleTransform = { scale, 0, 0, scale, 0, 0 }; // FIXME: Add subpixel translation.
+ Pixel_8888 backgroundColor;
+ vImageAffineWarp_ARGB8888(&src, &dest, 0, &scaleTransform, backgroundColor, kvImageEdgeExtend);
</ins><span class="cx"> }
</span><del>-#endif // USE(IOSURFACE_CANVAS_BACKING_STORE)
</del><ins>+
</ins><span class="cx"> #endif // USE(ACCELERATE)
</span><span class="cx">
</span><span class="cx"> RefPtr<Uint8ClampedArray> ImageBufferData::getData(const IntRect& rect, const IntSize& size, bool accelerateRendering, bool unmultiplied, float resolutionScale) const
</span><span class="lines">@@ -167,41 +151,34 @@
</span><span class="cx"> if (!accelerateRendering) {
</span><span class="cx"> srcBytesPerRow = bytesPerRow.unsafeGet();
</span><span class="cx"> srcRows = reinterpret_cast<unsigned char*>(data) + originy * srcBytesPerRow + originx * 4;
</span><del>-
</del><ins>+
</ins><span class="cx"> #if USE(ACCELERATE)
</span><span class="cx"> if (unmultiplied) {
</span><del>-#if USE_ARGB32
- ScanlineData scanlineData;
- scanlineData.scanlineWidth = destw.unsafeGet();
- scanlineData.srcData = srcRows;
- scanlineData.srcRowBytes = srcBytesPerRow;
- scanlineData.destData = destRows;
- scanlineData.destRowBytes = destBytesPerRow;
</del><span class="cx">
</span><del>- dispatch_apply_f(desth.unsafeGet(), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), &scanlineData, unpremultitplyScanline);
-#else
</del><span class="cx"> vImage_Buffer src;
</span><del>- src.height = height.unsafeGet();
</del><span class="cx"> src.width = width.unsafeGet();
</span><ins>+ src.height = height.unsafeGet();
</ins><span class="cx"> src.rowBytes = srcBytesPerRow;
</span><span class="cx"> src.data = srcRows;
</span><del>-
- vImage_Buffer dst;
- dst.height = desth.unsafeGet();
- dst.width = destw.unsafeGet();
- dst.rowBytes = destBytesPerRow;
- dst.data = destRows;
</del><span class="cx">
</span><ins>+ vImage_Buffer dest;
+ dest.width = destw.unsafeGet();
+ dest.height = desth.unsafeGet();
+ dest.rowBytes = destBytesPerRow;
+ dest.data = destRows;
+
+#if USE_ARGB32
+ unpremultiplyBufferData(src, dest);
+#else
</ins><span class="cx"> if (resolutionScale != 1) {
</span><del>- vImage_AffineTransform scaleTransform = { 1 / resolutionScale, 0, 0, 1 / resolutionScale, 0, 0 }; // FIXME: Add subpixel translation.
- Pixel_8888 backgroundColor;
- vImageAffineWarp_ARGB8888(&src, &dst, 0, &scaleTransform, backgroundColor, kvImageEdgeExtend);
</del><ins>+ affineWarpBufferData(src, dest, 1 / resolutionScale);
</ins><span class="cx"> // The unpremultiplying will be done in-place.
</span><del>- src = dst;
</del><ins>+ src = dest;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- vImageUnpremultiplyData_RGBA8888(&src, &dst, kvImageNoFlags);
</del><ins>+ vImageUnpremultiplyData_RGBA8888(&src, &dest, kvImageNoFlags);
</ins><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -279,42 +256,28 @@
</span><span class="cx"> srcRows = static_cast<unsigned char*>(IOSurfaceGetBaseAddress(surfaceRef)) + originy * srcBytesPerRow + originx * 4;
</span><span class="cx">
</span><span class="cx"> #if USE(ACCELERATE)
</span><ins>+
</ins><span class="cx"> vImage_Buffer src;
</span><del>- src.height = height.unsafeGet();
</del><span class="cx"> src.width = width.unsafeGet();
</span><ins>+ src.height = height.unsafeGet();
</ins><span class="cx"> src.rowBytes = srcBytesPerRow;
</span><span class="cx"> src.data = srcRows;
</span><span class="cx">
</span><span class="cx"> vImage_Buffer dest;
</span><del>- dest.height = desth.unsafeGet();
</del><span class="cx"> dest.width = destw.unsafeGet();
</span><ins>+ dest.height = desth.unsafeGet();
</ins><span class="cx"> dest.rowBytes = destBytesPerRow;
</span><span class="cx"> dest.data = destRows;
</span><span class="cx">
</span><span class="cx"> if (resolutionScale != 1) {
</span><del>- vImage_AffineTransform scaleTransform = { 1 / resolutionScale, 0, 0, 1 / resolutionScale, 0, 0 }; // FIXME: Add subpixel translation.
- Pixel_8888 backgroundColor;
- vImageAffineWarp_ARGB8888(&src, &dest, 0, &scaleTransform, backgroundColor, kvImageEdgeExtend);
</del><ins>+ affineWarpBufferData(src, dest, 1 / resolutionScale);
</ins><span class="cx"> // The unpremultiplying and channel-swapping will be done in-place.
</span><del>- if (unmultiplied) {
- srcRows = destRows;
- width = destw;
- height = desth;
- srcBytesPerRow = destBytesPerRow;
- } else
- src = dest;
</del><ins>+ src = dest;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (unmultiplied) {
- ScanlineData scanlineData;
- scanlineData.scanlineWidth = destw.unsafeGet();
- scanlineData.srcData = srcRows;
- scanlineData.srcRowBytes = srcBytesPerRow;
- scanlineData.destData = destRows;
- scanlineData.destRowBytes = destBytesPerRow;
-
- dispatch_apply_f(desth.unsafeGet(), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), &scanlineData, unpremultitplyScanline);
- } else {
</del><ins>+ if (unmultiplied)
+ unpremultiplyBufferData(src, dest);
+ else {
</ins><span class="cx"> // Swap pixel channels from BGRA to RGBA.
</span><span class="cx"> const uint8_t map[4] = { 2, 1, 0, 3 };
</span><span class="cx"> vImagePermuteChannels_ARGB8888(&src, &dest, map, kvImageNoFlags);
</span><span class="lines">@@ -431,41 +394,32 @@
</span><span class="cx"> if (!accelerateRendering) {
</span><span class="cx"> destBytesPerRow = bytesPerRow.unsafeGet();
</span><span class="cx"> destRows = reinterpret_cast<unsigned char*>(data) + (desty * destBytesPerRow + destx * 4).unsafeGet();
</span><del>-
-#if USE(ACCELERATE)
</del><ins>+
+#if USE(ACCELERATE)
</ins><span class="cx"> if (unmultiplied) {
</span><del>-#if USE_ARGB32
- // FIXME: Are scanlineData.scanlineWidth and the number of iterations specified to dispatch_apply_f() correct?
- ScanlineData scanlineData;
- scanlineData.scanlineWidth = width.unsafeGet();
- scanlineData.srcData = srcRows;
- scanlineData.srcRowBytes = srcBytesPerRow;
- scanlineData.destData = destRows;
- scanlineData.destRowBytes = destBytesPerRow;
</del><span class="cx">
</span><del>- dispatch_apply_f(height.unsafeGet(), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), &scanlineData, premultitplyScanline);
-#else
</del><span class="cx"> vImage_Buffer src;
</span><del>- src.height = height.unsafeGet();
</del><span class="cx"> src.width = width.unsafeGet();
</span><ins>+ src.height = height.unsafeGet();
</ins><span class="cx"> src.rowBytes = srcBytesPerRow;
</span><span class="cx"> src.data = srcRows;
</span><del>-
- vImage_Buffer dst;
- dst.height = desth.unsafeGet();
- dst.width = destw.unsafeGet();
- dst.rowBytes = destBytesPerRow;
- dst.data = destRows;
</del><span class="cx">
</span><ins>+ vImage_Buffer dest;
+ dest.width = destw.unsafeGet();
+ dest.height = desth.unsafeGet();
+ dest.rowBytes = destBytesPerRow;
+ dest.data = destRows;
+
+#if USE_ARGB32
+ unpremultiplyBufferData(src, dest);
+#else
</ins><span class="cx"> if (resolutionScale != 1) {
</span><del>- vImage_AffineTransform scaleTransform = { resolutionScale, 0, 0, resolutionScale, 0, 0 }; // FIXME: Add subpixel translation.
- Pixel_8888 backgroundColor;
- vImageAffineWarp_ARGB8888(&src, &dst, 0, &scaleTransform, backgroundColor, kvImageEdgeExtend);
</del><ins>+ affineWarpBufferData(src, dest, resolutionScale);
</ins><span class="cx"> // The premultiplying will be done in-place.
</span><del>- src = dst;
</del><ins>+ src = dest;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- vImagePremultiplyData_RGBA8888(&src, &dst, kvImageNoFlags);
</del><ins>+ vImagePremultiplyData_RGBA8888(&src, &dest, kvImageNoFlags);
</ins><span class="cx"> #endif
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -479,6 +433,7 @@
</span><span class="cx"> if (!unmultiplied)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // The premultiplying will be done in-place.
</ins><span class="cx"> srcRows = destRows;
</span><span class="cx"> srcBytesPerRow = destBytesPerRow;
</span><span class="cx"> width = destw;
</span><span class="lines">@@ -524,41 +479,26 @@
</span><span class="cx">
</span><span class="cx"> #if USE(ACCELERATE)
</span><span class="cx"> vImage_Buffer src;
</span><del>- src.height = height.unsafeGet();
</del><span class="cx"> src.width = width.unsafeGet();
</span><ins>+ src.height = height.unsafeGet();
</ins><span class="cx"> src.rowBytes = srcBytesPerRow;
</span><span class="cx"> src.data = srcRows;
</span><span class="cx">
</span><span class="cx"> vImage_Buffer dest;
</span><del>- dest.height = desth.unsafeGet();
</del><span class="cx"> dest.width = destw.unsafeGet();
</span><ins>+ dest.height = desth.unsafeGet();
</ins><span class="cx"> dest.rowBytes = destBytesPerRow;
</span><span class="cx"> dest.data = destRows;
</span><span class="cx">
</span><span class="cx"> if (resolutionScale != 1) {
</span><del>- vImage_AffineTransform scaleTransform = { resolutionScale, 0, 0, resolutionScale, 0, 0 }; // FIXME: Add subpixel translation.
- Pixel_8888 backgroundColor;
- vImageAffineWarp_ARGB8888(&src, &dest, 0, &scaleTransform, backgroundColor, kvImageEdgeExtend);
</del><ins>+ affineWarpBufferData(src, dest, resolutionScale);
</ins><span class="cx"> // The unpremultiplying and channel-swapping will be done in-place.
</span><del>- if (unmultiplied) {
- srcRows = destRows;
- width = destw;
- height = desth;
- srcBytesPerRow = destBytesPerRow;
- } else
- src = dest;
</del><ins>+ src = dest;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (unmultiplied) {
- ScanlineData scanlineData;
- scanlineData.scanlineWidth = width.unsafeGet();
- scanlineData.srcData = srcRows;
- scanlineData.srcRowBytes = srcBytesPerRow;
- scanlineData.destData = destRows;
- scanlineData.destRowBytes = destBytesPerRow;
-
- dispatch_apply_f(height.unsafeGet(), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), &scanlineData, premultitplyScanline);
- } else {
</del><ins>+ if (unmultiplied)
+ premultiplyBufferData(src, dest);
+ else {
</ins><span class="cx"> // Swap pixel channels from RGBA to BGRA.
</span><span class="cx"> const uint8_t map[4] = { 2, 1, 0, 3 };
</span><span class="cx"> vImagePermuteChannels_ARGB8888(&src, &dest, map, kvImageNoFlags);
</span></span></pre>
</div>
</div>
</body>
</html>