Merge pull request #68 from RSully/bugfix-animagebitmaprep

Replace ANImageBitmapRep with newest version. Fixes #67.

Author: RSully

RSColorPicker/ColorPickerClasses/ANImageBitmapRep/ANImageBitmapRep.m

@@ -38,7 +38,7 @@ @implementation ANImageBitmapRep
 - (void)forwardInvocation:(NSInvocation *)anInvocation {
     if (!baseClasses) [self generateBaseClasses];
     for (int i = 0; i < [baseClasses count]; i++) {
-        BitmapContextManipulator * manip = baseClasses[i];
+        BitmapContextManipulator * manip = [baseClasses objectAtIndex:i];
         if ([manip respondsToSelector:[anInvocation selector]]) {
             [anInvocation invokeWithTarget:manip];
             return;
@@ -148,7 +148,7 @@ - (void)generateBaseClasses {
     BitmapScaleManipulator * scalable = [[BitmapScaleManipulator alloc] initWithContext:self];
     BitmapRotationManipulator * rotatable = [[BitmapRotationManipulator alloc] initWithContext:self];
     BitmapDrawManipulator * drawable = [[BitmapDrawManipulator alloc] initWithContext:self];
-    baseClasses = @[croppable, scalable, rotatable, drawable];
+    baseClasses = [[NSArray alloc] initWithObjects:croppable, scalable, rotatable, drawable, nil];
 #if __has_feature(objc_arc) != 1
     [rotatable release];
     [scalable release];

RSColorPicker/ColorPickerClasses/ANImageBitmapRep/BitmapContextRep.h

@@ -42,6 +42,13 @@ BMPoint BMPointFromPoint (CGPoint point);
  */
 - (id)initWithImage:(ANImageObj *)image;
 
+/**
+ * Creates a bitmap context with the information from a CGImageRef.
+ * @param image The image to use for initialization. The reference will
+ * not be consumed, so you will still need to CGImageRelease() this as expected.
+ */
+- (id)initWithCGImage:(CGImageRef)img;
+
 /**
  * Creates a blank bitmap context with specified dimensions.
  * @param sizePoint The size to use for the new bitmap.  The x value
@@ -101,6 +108,12 @@ BMPoint BMPointFromPoint (CGPoint point);
  */
 - (CGImageRef)CGImage;
 
+/**
+ * Returns a mutable RGBA data array. If you modify this, you should call
+ * [context setNeedsUpdate:YES] before calling [context CGImage] or similar.
+ */
+- (unsigned char *)bitmapData;
+
 @end
 
 @protocol BitmapContextRep

RSColorPicker/ColorPickerClasses/ANImageBitmapRep/BitmapContextRep.m

@@ -27,9 +27,19 @@ @implementation BitmapContextRep
 
 - (id)initWithImage:(ANImageObj *)image {
     if ((self = [super init])) {
-        context = [CGContextCreator newARGBBitmapContextWithImage:CGImageFromANImage(image)];
+        CGImageRef img = CGImageFromANImage(image);
+        context = [CGContextCreator newARGBBitmapContextWithImage:img];
         bitmapData = CGBitmapContextGetData(context);
-        lastImage = CGBitmapContextCreateImage(context);
+        lastImage = CGImageRetain(img);
+    }
+    return self;
+}
+
+- (id)initWithCGImage:(CGImageRef)img {
+    if ((self = [super init])) {
+        context = [CGContextCreator newARGBBitmapContextWithImage:img];
+        bitmapData = CGBitmapContextGetData(context);
+        lastImage = CGImageRetain(img);
     }
     return self;
 }
@@ -114,6 +124,10 @@ - (CGImageRef)CGImage {
 #endif
 }
 
+- (unsigned char *)bitmapData {
+    return bitmapData;
+}
+
 - (void)dealloc {
     CGContextRelease(context);
     free(bitmapData);

RSColorPicker/ColorPickerClasses/ANImageBitmapRep/Compatibility/NSImage+ANImageBitmapRep.h

@@ -6,6 +6,8 @@
 //  Copyright (c) 2011 __MyCompanyName__. All rights reserved.
 //
 
+#import "TargetConditionals.h"
+
 #if TARGET_OS_IPHONE != 1
 
 #import <Cocoa/Cocoa.h>

RSColorPicker/ColorPickerClasses/ANImageBitmapRep/Compatibility/NSImage+ANImageBitmapRep.m

@@ -6,6 +6,8 @@
 //  Copyright (c) 2011 __MyCompanyName__. All rights reserved.
 //
 
+#import "TargetConditionals.h"
+
 #if TARGET_OS_IPHONE != 1
 
 #import "NSImage+ANImageBitmapRep.h"

RSColorPicker/ColorPickerClasses/ANImageBitmapRep/Compatibility/OSCommonImage.h

@@ -9,6 +9,7 @@
 #ifndef ImageBitmapRep_OSCommonImage_h
 #define ImageBitmapRep_OSCommonImage_h
 
+#import "TargetConditionals.h"
 #import "CGImageContainer.h"
 
 #if TARGET_OS_IPHONE

RSColorPicker/ColorPickerClasses/ANImageBitmapRep/Compatibility/UIImage+ANImageBitmapRep.h

@@ -6,6 +6,8 @@
 //  Copyright 2011 __MyCompanyName__. All rights reserved.
 //
 
+#import "TargetConditionals.h"
+
 #if TARGET_OS_IPHONE
 
 @class ANImageBitmapRep;

RSColorPicker/ColorPickerClasses/ANImageBitmapRep/Compatibility/UIImage+ANImageBitmapRep.m

@@ -6,6 +6,8 @@
 //  Copyright 2011 __MyCompanyName__. All rights reserved.
 //
 
+#import "TargetConditionals.h"
+
 #if TARGET_OS_IPHONE
 
 #import "UIImage+ANImageBitmapRep.h"

RSColorPicker/ColorPickerClasses/ANImageBitmapRep/CoreGraphics/CGContextCreator.h

@@ -7,6 +7,13 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "TargetConditionals.h"
+
+#if TARGET_OS_IPHONE
+#import <CoreGraphics/CoreGraphics.h>
+#elif TARGET_OS_MAC
+#import <Quartz/Quartz.h>
+#endif
 
 /**
  * This class has several static methods for creating bitmap contexts.

RSColorPicker/ColorPickerClasses/ANImageBitmapRep/CoreGraphics/CGImageContainer.h

@@ -6,17 +6,16 @@
 //  Copyright 2011 __MyCompanyName__. All rights reserved.
 //
 
-
-#if __has_feature(objc_arc) != 1
-
 #import <Foundation/Foundation.h>
+#import "TargetConditionals.h"
 
 #if TARGET_OS_IPHONE
 #import <CoreGraphics/CoreGraphics.h>
 #elif TARGET_OS_MAC
 #import <Quartz/Quartz.h>
 #endif
 
+#if __has_feature(objc_arc) != 1
 
 @interface CGImageContainer : NSObject {
     CGImageRef image;