gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 22:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small changes for colour space handling.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28947 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2009-11-03 21:32:52 +00:00
parent 6d3f57e366
commit 16312cec5e
3 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-11-03 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSColor.m (-colorUsingColorSpace): Support more color spaces.
* Source/NSColorSpace.m (COLORSPACE): Initialize the static variable.
2009-11-03 Fred Kiefer <FredKiefer@gmx.de> 2009-11-03 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSThemeDrawing.m: Add more includes to apeace Riccardo's compiler. * Source/GSThemeDrawing.m: Add more includes to apeace Riccardo's compiler.

19
Source/NSColor.m
View file

@ -1166,6 +1166,13 @@ systemColorWithName(NSString *name)
count: (int)number count: (int)number
{ {
// FIXME // FIXME
if (space == [NSColorSpace genericRGBColorSpace] && (number == 4))
{
return [self colorWithCalibratedRed: comp[0]
green: comp[1]
blue: comp[2]
alpha: comp[3]];
}
if (space == [NSColorSpace deviceRGBColorSpace] && (number == 4)) if (space == [NSColorSpace deviceRGBColorSpace] && (number == 4))
{ {
return [self colorWithDeviceRed: comp[0] return [self colorWithDeviceRed: comp[0]
@ -1173,10 +1180,22 @@ systemColorWithName(NSString *name)
blue: comp[2] blue: comp[2]
alpha: comp[3]]; alpha: comp[3]];
} }
if (space == [NSColorSpace genericGrayColorSpace] && (number == 2))
{
return [NSColor colorWithCalibratedWhite: comp[0] alpha: comp[1]];
}
if (space == [NSColorSpace deviceGrayColorSpace] && (number == 2)) if (space == [NSColorSpace deviceGrayColorSpace] && (number == 2))
{ {
return [NSColor colorWithDeviceWhite: comp[0] alpha: comp[1]]; return [NSColor colorWithDeviceWhite: comp[0] alpha: comp[1]];
} }
if (space == [NSColorSpace genericCMYKColorSpace] && (number == 5))
{
return [NSColor colorWithDeviceCyan: comp[0]
magenta: comp[1]
yellow: comp[2]
black: comp[3]
alpha: comp[4]];
}
if (space == [NSColorSpace deviceCMYKColorSpace] && (number == 5)) if (space == [NSColorSpace deviceCMYKColorSpace] && (number == 5))
{ {
return [NSColor colorWithDeviceCyan: comp[0] return [NSColor colorWithDeviceCyan: comp[0]

2
Source/NSColorSpace.m
View file

@ -45,7 +45,7 @@
} }
#define COLORSPACE(model) \ #define COLORSPACE(model) \
static NSColorSpace *csp; \ static NSColorSpace *csp = nil; \
if (!csp) \ if (!csp) \
csp = [[self alloc] _initWithColorSpaceModel: model]; \ csp = [[self alloc] _initWithColorSpaceModel: model]; \
return csp; return csp;