gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 17:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

In [supportMaxColorSpaces] added converions from RGB to CMYK.

Browse source 
In [colorUsingColorSpaceName:device:] added convertion from named
colour.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8972 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
FredKiefer 2001-02-05 01:22:43 +00:00
parent a1f62197e4
commit dce9d75ce3
1 changed files with 44 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Source/NSColor.m
View file

@ -951,6 +951,21 @@ NSColor* systemColorWithName(NSString *name)
return self;
}
if ([_colorspace_name isEqualToString: NSNamedColorSpace])
{
NSColorList *list = [NSColorList colorListNamed: _catalog_name];
NSColor *real = [list colorWithKey: _color_name];
return [real colorUsingColorSpaceName: colorSpace
device: deviceDescription];
}
if ([colorSpace isEqualToString: NSNamedColorSpace])
{
// FIXME: We cannot convert to named color space.
return nil;
}
[self supportMaxColorSpaces];
if ([colorSpace isEqualToString: NSCalibratedRGBColorSpace])
@ -995,6 +1010,20 @@ NSColor* systemColorWithName(NSString *name)
}
}
if ([colorSpace isEqualToString: NSDeviceCMYKColorSpace])
{
if (_valid_components & GNUSTEP_GUI_CMYK_ACTIVE)
{
NSColor *aCopy = [self copy];
if (aCopy)
{
aCopy->_active_component = GNUSTEP_GUI_CMYK_ACTIVE;
ASSIGN(aCopy->_colorspace_name, NSDeviceCMYKColorSpace);
}
return aCopy;
}
}
return nil;
}
@ -1382,7 +1411,8 @@ NSColor* systemColorWithName(NSString *name)
double m = _CMYK_component.magenta;
double y = _CMYK_component.yellow;
double white = 1 - _CMYK_component.black;
// FIXME: Check if this is correct
_RGB_component.red = (c > white ? 0 : white - c);
_RGB_component.green = (m > white ? 0 : white - m);
_RGB_component.blue = (y > white ? 0 : white - y);
@ -1499,6 +1529,18 @@ NSColor* systemColorWithName(NSString *name)
_valid_components |= GNUSTEP_GUI_HSB_ACTIVE;
}
/*
* RGB to CMYK if required.
*/
if ((_valid_components & GNUSTEP_GUI_CMYK_ACTIVE) == 0)
{
_CMYK_component.cyan = 1 - _RGB_component.red;
_CMYK_component.magenta = 1 - _RGB_component.green;
_CMYK_component.yellow = 1 - _RGB_component.blue;
_CMYK_component.black = 0;
_valid_components |= GNUSTEP_GUI_CMYK_ACTIVE;
}
/*
* RGB to white if required.
*/
@ -1507,6 +1549,7 @@ NSColor* systemColorWithName(NSString *name)
_white_component = (_RGB_component.red + _RGB_component.green + _RGB_component.blue)/3;
_valid_components |= GNUSTEP_GUI_WHITE_ACTIVE;
}
}
}