From 908a4c37e0d36fc7f2d1aa54efdb928ab455feb7 Mon Sep 17 00:00:00 2001 From: Michael Robinson Date: Fri, 27 Feb 2015 00:18:00 +1300 Subject: [PATCH 1/3] Fixed warning Implicit conversion from enumeration type 'enum CGImageAlphaInfo' to different enumeration type 'CGBitmapInfo' (aka 'enum CGBitmapInfo') --- ColorArt/Classes/SLColorArt.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ColorArt/Classes/SLColorArt.m b/ColorArt/Classes/SLColorArt.m index 69e27c8..31e21a8 100644 --- a/ColorArt/Classes/SLColorArt.m +++ b/ColorArt/Classes/SLColorArt.m @@ -233,8 +233,7 @@ - (UIColor*)_findEdgeColor:(UIImage*)image imageColors:(NSArray**)colors NSInteger height = CGImageGetHeight(imageRep); //[imageRep pixelsHigh]; CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB(); - CGContextRef bmContext = CGBitmapContextCreate(NULL, width, height, 8, 4 * width, cs, kCGImageAlphaNoneSkipLast); - CGContextDrawImage(bmContext, (CGRect){.origin.x = 0.0f, .origin.y = 0.0f, .size.width = width, .size.height = height}, image.CGImage); + CGContextRef bmContext = CGBitmapContextCreate(NULL, width, height, 8, 4 * width, cs, (CGBitmapInfo)kCGImageAlphaNoneSkipLast); CGContextDrawImage(bmContext, (CGRect){.origin.x = 0.0f, .origin.y = 0.0f, .size.width = width, .size.height = height}, image.CGImage); CGColorSpaceRelease(cs); const RGBAPixel* pixels = (const RGBAPixel*)CGBitmapContextGetData(bmContext); for (NSUInteger y = 0; y < height; y++) From 9a910264254b2e8d2a8075375a9dc79e2ed5adb0 Mon Sep 17 00:00:00 2001 From: Michael Robinson Date: Wed, 25 Mar 2015 00:09:39 +1300 Subject: [PATCH 2/3] Increase pixel range --- ColorArt/Classes/SLColorArt.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ColorArt/Classes/SLColorArt.m b/ColorArt/Classes/SLColorArt.m index 31e21a8..0f33de1 100644 --- a/ColorArt/Classes/SLColorArt.m +++ b/ColorArt/Classes/SLColorArt.m @@ -212,7 +212,7 @@ - (UIColor*)_findEdgeColor:(UIImage*)image imageColors:(NSArray**)colors { CGImageRef imageRep = image.CGImage; - NSUInteger pixelRange = 8; + NSUInteger pixelRange = 32; NSUInteger scale = 256 / pixelRange; NSUInteger rawImageColors[pixelRange][pixelRange][pixelRange]; NSUInteger rawEdgeColors[pixelRange][pixelRange][pixelRange]; From eb0128874f6ecf10a08aac12f7480f8482ddeea1 Mon Sep 17 00:00:00 2001 From: Michael Robinson Date: Wed, 25 Mar 2015 00:14:56 +1300 Subject: [PATCH 3/3] Revert --- ColorArt/Classes/SLColorArt.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ColorArt/Classes/SLColorArt.m b/ColorArt/Classes/SLColorArt.m index 0f33de1..31e21a8 100644 --- a/ColorArt/Classes/SLColorArt.m +++ b/ColorArt/Classes/SLColorArt.m @@ -212,7 +212,7 @@ - (UIColor*)_findEdgeColor:(UIImage*)image imageColors:(NSArray**)colors { CGImageRef imageRep = image.CGImage; - NSUInteger pixelRange = 32; + NSUInteger pixelRange = 8; NSUInteger scale = 256 / pixelRange; NSUInteger rawImageColors[pixelRange][pixelRange][pixelRange]; NSUInteger rawEdgeColors[pixelRange][pixelRange][pixelRange];