From 63e63ce7a10a7ba9e11f08fd0320d60667d07de7 Mon Sep 17 00:00:00 2001
From: Gerrit Riessen <gerrit.riessen@gmail.com>
Date: Sat, 23 Apr 2011 17:22:02 +0200
Subject: [PATCH] fix the color creation when using shortcut functions

---
 AppKit/CoreGraphics/CGColor.j |  7 ++--
 Tests/AppKit/CGColorTest.j    | 67 +++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 Tests/AppKit/CGColorTest.j

diff --git a/AppKit/CoreGraphics/CGColor.j b/AppKit/CoreGraphics/CGColor.j
index 321d091b6..9f141c80c 100644
--- a/AppKit/CoreGraphics/CGColor.j
+++ b/AppKit/CoreGraphics/CGColor.j
@@ -108,7 +108,7 @@ function CGColorCreateCopy(aColor)
 */
 function CGColorCreateGenericGray(gray, alpha)
 {
-    return CGColorCreate(0, [gray, alpha]);
+    return CGColorCreate(CGColorSpaceCreateDeviceRGB(), [gray,gray,gray, alpha]);
 }
 
 /*!
@@ -122,7 +122,7 @@ function CGColorCreateGenericGray(gray, alpha)
 */
 function CGColorCreateGenericRGB(red, green, blue, alpha)
 {
-    return CGColorCreate(0, [red, green, blue, alpha]);
+    return CGColorCreate(CGColorSpaceCreateDeviceRGB(), [red, green, blue, alpha]);
 }
 
 /*!
@@ -137,7 +137,8 @@ function CGColorCreateGenericRGB(red, green, blue, alpha)
 */
 function CGColorCreateGenericCMYK(cyan, magenta, yellow, black, alpha)
 {
-    return CGColorCreate(0, [cyan, magenta, yellow, black, alpha]);
+    return CGColorCreate(CGColorSpaceCreateDeviceCMYK(), 
+                         [cyan, magenta, yellow, black, alpha]);
 }
 
 /*!
diff --git a/Tests/AppKit/CGColorTest.j b/Tests/AppKit/CGColorTest.j
new file mode 100644
index 000000000..bb4bf2be6
--- /dev/null
+++ b/Tests/AppKit/CGColorTest.j
@@ -0,0 +1,67 @@
+@import <AppKit/CGColor.j>
+
+@implementation CGColorTest : OJTestCase
+
+- (void)testColorCreate
+{
+    var colorspace = CGColorSpaceCreateDeviceRGB(), 
+        components = [2,3,4,5],
+        clruid = CFHashCode(colorspace) + components.join("");
+
+    // Can't access the colormap cache, but it would be nice to 
+    // [self assert:NULL equals:_CGColorMap[clruid]];
+
+    var clr = CGColorCreate( colorspace, components );
+    [self assert:colorspace equals:clr.colorspace message:"colorspace failed"];
+    [self assert:[1,1,1,1]  equals:clr.components message:"components failed"];
+    [self assert:NULL       equals:clr.pattern message:"pattern failed"];
+
+    // Can't access the colormap cache, but it would be nice to 
+    // [self assert:clr equals:_CGColorMap[clruid]];
+}
+
+- (void)testColorCopy
+{
+    // it returns it's argument, a little artifical but will fail if something
+    // changes with the function.
+    [self assert:"banana" equals:CGColorCreateCopy( "banana" )];
+
+    var colorspace = CGColorSpaceCreateDeviceRGB(), 
+        components = [2,3,4,5],
+        clr = CGColorCreate( colorspace, components );
+    [self assert:clr equals:CGColorCreateCopy(clr)];
+}
+
+- (void)testColorCreateGenericGray
+{
+    var clr = CGColorCreateGenericGray(0.3, 0.5);
+    [self assert:CGColorSpaceCreateDeviceRGB() 
+          equals:clr.colorspace message:"colorspace failed"];
+    [self assert:[ROUND(0.3*255)/255,ROUND(0.3*255)/255,ROUND(0.3*255)/255,0.5]  
+          equals:clr.components message:"components failed"];
+    [self assert:NULL equals:clr.pattern message:"pattern failed"];
+}
+
+- (void)testColorCreateGenericRGB
+{
+    var clr = CGColorCreateGenericRGB(0.4,0.3,0.2,0.1);
+    [self assert:CGColorSpaceCreateDeviceRGB() 
+          equals:clr.colorspace message:"colorspace failed"];
+    [self assert:[ROUND(0.4*255)/255,ROUND(0.3*255)/255,ROUND(0.2*255)/255,0.1]
+          equals:clr.components message:"components failed"];
+    [self assert:NULL equals:clr.pattern message:"pattern failed"];
+}
+
+- (void)testColorCreateGenericCMYK
+{
+    var clr = CGColorCreateGenericCMYK(0.2, 0.3, 0.4, 0.5, 0.6)
+    [self assert:CGColorSpaceCreateDeviceCMYK()
+          equals:clr.colorspace message:"colorspace failed"];
+    [self assert:[ROUND(0.2*255)/255,ROUND(0.3*255)/255,ROUND(0.4*255)/255,
+                       ROUND(0.5*255)/255, 0.6]
+          equals:clr.components message:"components failed"];
+    [self assert:NULL equals:clr.pattern message:"pattern failed"];
+}
+
+@end
+