From 81c6ff356933224d1c2e283556357b16dd83a6b3 Mon Sep 17 00:00:00 2001 From: Jeyaram Jeyaraj Date: Tue, 15 Nov 2016 08:41:03 -0800 Subject: [PATCH] fixxes --- tests/unittests/CoreGraphics/CGBitmapContextTests.mm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/unittests/CoreGraphics/CGBitmapContextTests.mm b/tests/unittests/CoreGraphics/CGBitmapContextTests.mm index 2aa25fff95..e0fc000df5 100644 --- a/tests/unittests/CoreGraphics/CGBitmapContextTests.mm +++ b/tests/unittests/CoreGraphics/CGBitmapContextTests.mm @@ -147,7 +147,7 @@ void _TestPixelFormat(const CGRect bounds, const CGBitmapInfo info, DWORD expect ); } -static void _expectArrayValues(BYTE* res, BYTE* source, int size) { +static void _expectArrayValues(const BYTE* res, const BYTE* source, int size) { for (int i = 0; i < size; ++i) { EXPECT_EQ(res[i], source[i]); } @@ -209,9 +209,9 @@ static void _expectArrayValues(BYTE* res, BYTE* source, int size) { woc::unique_cf image(CGBitmapContextCreateImage(context.get())); ASSERT_NE(image, nullptr); - NSData* dataProvider = static_cast(CGImageGetDataProvider(image.get())); - ASSERT_NE(dataProvider, nullptr); + woc::unique_cf rawData(CGDataProviderCopyData(CGImageGetDataProvider(image.get()))); + ASSERT_NE(rawData, nullptr); - NSData* ref = [[NSData dataWithBytesNoCopy:result length:4 freeWhenDone:NO] autorelease]; - ASSERT_OBJCEQ(dataProvider, ref); + const BYTE* rData = static_cast(CFDataGetBytePtr(rawData.get())); + _expectArrayValues(result, rData, 4); }