Title: [187821] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187821
- Author
- [email protected]
- Date
- 2015-08-04 00:01:42 -0700 (Tue, 04 Aug 2015)
Log Message
Merge r187536. rdar://problem/21893047
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187820 => 187821)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-04 07:01:39 UTC (rev 187820)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-04 07:01:42 UTC (rev 187821)
@@ -1,5 +1,17 @@
2015-08-03 Matthew Hanson <[email protected]>
+ Merge r187536. rdar://problem/21893047
+
+ 2015-07-28 Simon Fraser <[email protected]>
+
+ Fix debug builds.
+
+ * platform/graphics/cg/ImageBufferDataCG.cpp:
+ (WebCore::premultiplyBufferData):
+ (WebCore::unpremultiplyBufferData):
+
+2015-08-03 Matthew Hanson <[email protected]>
+
Merge r187534. rdar://problem/21893047
2015-07-28 Dean Jackson <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp (187820 => 187821)
--- branches/safari-601.1-branch/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-08-04 07:01:39 UTC (rev 187820)
+++ branches/safari-601.1-branch/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-08-04 07:01:42 UTC (rev 187821)
@@ -59,8 +59,8 @@
#if USE_ARGB32 || USE(IOSURFACE_CANVAS_BACKING_STORE)
static void premultiplyBufferData(const vImage_Buffer& src, const vImage_Buffer& dest)
{
- ASSERT(src->data);
- ASSERT(dest->data);
+ ASSERT(src.data);
+ ASSERT(dest.data);
if (kvImageNoError != vImagePremultiplyData_RGBA8888(&src, &dest, kvImageNoFlags))
return;
@@ -72,8 +72,8 @@
static void unpremultiplyBufferData(const vImage_Buffer& src, const vImage_Buffer& dest)
{
- ASSERT(src->data);
- ASSERT(dest->data);
+ ASSERT(src.data);
+ ASSERT(dest.data);
if (kvImageNoError != vImageUnpremultiplyData_RGBA8888(&src, &dest, kvImageNoFlags))
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
