gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 19:01:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSBitmapImageRep.m:

Browse source 
* Source/NSColor.m:
* Source/GSThemeTools.m:
* Source/NSGraphicsContext.m:
* Headers/AppKit/NSColor.h:
* Headers/AppKit/NSGraphicsContext.h:
* ColorPickers/GSGrayColorPicker.m:
* ColorPickers/GSCMYKColorPicker.m:
* ColorPickers/GSWheelColorPicker.m:
* ColorPickers/GSRGBColorPicker.m:
* ColorPickers/GSHSBColorPicker.m: Migrate float to CGFloat in
NSColor


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34070 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2011-10-26 00:21:57 +00:00
parent 6aafb3c0e6
commit 25c6770196
12 changed files with 447 additions and 400 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2011-10-25 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSBitmapImageRep.m:
* Source/NSColor.m:
* Source/GSThemeTools.m:
* Source/NSGraphicsContext.m:
* Headers/AppKit/NSColor.h:
* Headers/AppKit/NSGraphicsContext.h:
* ColorPickers/GSGrayColorPicker.m:
* ColorPickers/GSCMYKColorPicker.m:
* ColorPickers/GSWheelColorPicker.m:
* ColorPickers/GSRGBColorPicker.m:
* ColorPickers/GSHSBColorPicker.m: Migrate float to CGFloat in
NSColor
2011-10-25 Fred Kiefer <FredKiefer@gmx.de>
* Headers/Additions/GNUstepGUI/GSXibLoading.h,

2
ColorPickers/GSCMYKColorPicker.m
View file

@ -64,7 +64,7 @@
- (void)setColor:(NSColor *)color
{
float cyan, magenta, yellow, black, alpha;
CGFloat cyan, magenta, yellow, black, alpha;
NSColor *c;
if (updating)

2
ColorPickers/GSGrayColorPicker.m
View file

@ -63,7 +63,7 @@
- (void)setColor:(NSColor *)color
{
float white, alpha;
CGFloat white, alpha;
NSColor *c;
if (updating)

2
ColorPickers/GSHSBColorPicker.m
View file

@ -62,7 +62,7 @@
- (void)setColor:(NSColor *)color
{
float hue, saturation, brightness, alpha;
CGFloat hue, saturation, brightness, alpha;
NSColor *c;
if (updating)

2
ColorPickers/GSRGBColorPicker.m
View file

@ -63,7 +63,7 @@
- (void)setColor:(NSColor *)color
{
float red, green, blue, alpha;
CGFloat red, green, blue, alpha;
NSColor *c;
if (updating)

2
ColorPickers/GSWheelColorPicker.m
View file

@ -433,7 +433,7 @@
- (void)setColor:(NSColor *)color
{
float hue, saturation, brightness, alpha;
CGFloat hue, saturation, brightness, alpha;
NSColor *c;
c = [color colorUsingColorSpaceName: NSCalibratedRGBColorSpace];

120
Headers/AppKit/NSColor.h
View file

@ -71,33 +71,33 @@ typedef enum _NSControlSize {
//
// Creating an NSColor from Component Values
//
+ (NSColor *)colorWithCalibratedHue:(float)hue
saturation:(float)saturation
brightness:(float)brightness
alpha:(float)alpha;
+ (NSColor *)colorWithCalibratedRed:(float)red
green:(float)green
blue:(float)blue
alpha:(float)alpha;
+ (NSColor *)colorWithCalibratedWhite:(float)white
alpha:(float)alpha;
+ (NSColor *)colorWithCalibratedHue:(CGFloat)hue
saturation:(CGFloat)saturation
brightness:(CGFloat)brightness
alpha:(CGFloat)alpha;
+ (NSColor *)colorWithCalibratedRed:(CGFloat)red
green:(CGFloat)green
blue:(CGFloat)blue
alpha:(CGFloat)alpha;
+ (NSColor *)colorWithCalibratedWhite:(CGFloat)white
alpha:(CGFloat)alpha;
+ (NSColor *)colorWithCatalogName:(NSString *)listName
colorName:(NSString *)colorName;
+ (NSColor *)colorWithDeviceCyan:(float)cyan
magenta:(float)magenta
yellow:(float)yellow
black:(float)black
alpha:(float)alpha;
+ (NSColor *)colorWithDeviceHue:(float)hue
saturation:(float)saturation
brightness:(float)brightness
alpha:(float)alpha;
+ (NSColor *)colorWithDeviceRed:(float)red
green:(float)green
blue:(float)blue
alpha:(float)alpha;
+ (NSColor *)colorWithDeviceWhite:(float)white
alpha:(float)alpha;
+ (NSColor *)colorWithDeviceCyan:(CGFloat)cyan
magenta:(CGFloat)magenta
yellow:(CGFloat)yellow
black:(CGFloat)black
alpha:(CGFloat)alpha;
+ (NSColor *)colorWithDeviceHue:(CGFloat)hue
saturation:(CGFloat)saturation
brightness:(CGFloat)brightness
alpha:(CGFloat)alpha;
+ (NSColor *)colorWithDeviceRed:(CGFloat)red
green:(CGFloat)green
blue:(CGFloat)blue
alpha:(CGFloat)alpha;
+ (NSColor *)colorWithDeviceWhite:(CGFloat)white
alpha:(CGFloat)alpha;
//
// Creating an NSColor With Preset Components
@ -127,41 +127,41 @@ typedef enum _NSControlSize {
//
// Retrieving a Set of Components
//
- (void)getCyan:(float *)cyan
magenta:(float *)magenta
yellow:(float *)yellow
black:(float *)black
alpha:(float *)alpha;
- (void)getHue:(float *)hue
saturation:(float *)saturation
brightness:(float *)brightness
alpha:(float *)alpha;
- (void)getRed:(float *)red
green:(float *)green
blue:(float *)blue
alpha:(float *)alpha;
- (void)getWhite:(float *)white
alpha:(float *)alpha;
- (void)getCyan:(CGFloat *)cyan
magenta:(CGFloat *)magenta
yellow:(CGFloat *)yellow
black:(CGFloat *)black
alpha:(CGFloat *)alpha;
- (void)getHue:(CGFloat *)hue
saturation:(CGFloat *)saturation
brightness:(CGFloat *)brightness
alpha:(CGFloat *)alpha;
- (void)getRed:(CGFloat *)red
green:(CGFloat *)green
blue:(CGFloat *)blue
alpha:(CGFloat *)alpha;
- (void)getWhite:(CGFloat *)white
alpha:(CGFloat *)alpha;
//
// Retrieving Individual Components
//
- (float)alphaComponent;
- (float)blackComponent;
- (float)blueComponent;
- (float)brightnessComponent;
- (CGFloat)alphaComponent;
- (CGFloat)blackComponent;
- (CGFloat)blueComponent;
- (CGFloat)brightnessComponent;
- (NSString *)catalogNameComponent;
- (NSString *)colorNameComponent;
- (float)cyanComponent;
- (float)greenComponent;
- (float)hueComponent;
- (CGFloat)cyanComponent;
- (CGFloat)greenComponent;
- (CGFloat)hueComponent;
- (NSString *)localizedCatalogNameComponent;
- (NSString *)localizedColorNameComponent;
- (float)magentaComponent;
- (float)redComponent;
- (float)saturationComponent;
- (float)whiteComponent;
- (float)yellowComponent;
- (CGFloat)magentaComponent;
- (CGFloat)redComponent;
- (CGFloat)saturationComponent;
- (CGFloat)whiteComponent;
- (CGFloat)yellowComponent;
//
// Converting to Another Color Space
@ -173,20 +173,20 @@ typedef enum _NSControlSize {
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
// + (NSColor *)colorWithCIColor:(CIColor *)color;
+ (NSColor *)colorWithColorSpace:(NSColorSpace *)space
components:(const float *)comp
count:(int)number;
components:(const CGFloat *)comp
count:(NSInteger)number;
- (NSColorSpace *)colorSpace;
- (NSColor *)colorUsingColorSpace:(NSColorSpace *)space;
- (void)getComponents:(float *)components;
- (int)numberOfComponents;
- (void)getComponents:(CGFloat *)components;
- (NSInteger)numberOfComponents;
#endif
//
// Changing the Color
//
- (NSColor *)blendedColorWithFraction:(float)fraction
- (NSColor *)blendedColorWithFraction:(CGFloat)fraction
ofColor:(NSColor *)aColor;
- (NSColor *)colorWithAlphaComponent:(float)alpha;
- (NSColor *)colorWithAlphaComponent:(CGFloat)alpha;
//
// Copying and Pasting
@ -208,8 +208,8 @@ typedef enum _NSControlSize {
//
// Changing the color
//
- (NSColor*) highlightWithLevel: (float)level;
- (NSColor*) shadowWithLevel: (float)level;
- (NSColor*) highlightWithLevel: (CGFloat)level;
- (NSColor*) shadowWithLevel: (CGFloat)level;
+ (NSColor*)colorWithPatternImage:(NSImage*)image;
+ (NSColor*)colorForControlTint:(NSControlTint)controlTint;

4
Headers/AppKit/NSGraphicsContext.h
View file

@ -279,8 +279,8 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void);
- (void) GSSetFillColorspace: (void *)spaceref;
- (void) GSSetStrokeColorspace: (void *)spaceref;
- (void) GSSetFillColor: (const float *)values;
- (void) GSSetStrokeColor: (const float *)values;
- (void) GSSetFillColor: (const CGFloat *)values;
- (void) GSSetStrokeColor: (const CGFloat *)values;
/* ----------------------------------------------------------------------- */
/* Text operations */

2
Source/GSThemeTools.m
View file

@ -782,7 +782,7 @@ withRepeatedImage: (NSImage*)image
- (id) initWithNinePatchImage: (NSImage*)image
{
int i;
float r,g,b,a;
CGFloat r,g,b,a;
int x1 = -1;
int x2 = -1;
int y1 = -1;

82
Source/NSBitmapImageRep.m
View file

@ -919,10 +919,10 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
|| [_colorSpace isEqualToString: NSDeviceRGBColorSpace])
{
unsigned int ir, ig, ib, ia;
float fr, fg, fb, fa;
float scale;
CGFloat fr, fg, fb, fa;
CGFloat scale;
scale = (float)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << _bitsPerSample) - 1);
if (_hasAlpha)
{
// This order depends on the bitmap format
@ -986,10 +986,10 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
|| [_colorSpace isEqual: NSCalibratedWhiteColorSpace])
{
unsigned int iw, ia;
float fw, fa;
float scale;
CGFloat fw, fa;
CGFloat scale;
scale = (float)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << _bitsPerSample) - 1);
if (_hasAlpha)
{
// FIXME: This order depends on the bitmap format
@ -1038,10 +1038,10 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
|| [_colorSpace isEqual: NSCalibratedBlackColorSpace])
{
unsigned int ib, ia;
float fw, fa;
float scale;
CGFloat fw, fa;
CGFloat scale;
scale = (float)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << _bitsPerSample) - 1);
if (_hasAlpha)
{
// This order depends on the bitmap format
@ -1087,10 +1087,10 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
else if ([_colorSpace isEqual: NSDeviceCMYKColorSpace])
{
unsigned int ic, im, iy, ib, ia;
float fc, fm, fy, fb, fa;
float scale;
CGFloat fc, fm, fy, fb, fa;
CGFloat scale;
scale = (float)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << _bitsPerSample) - 1);
if (_hasAlpha)
{
// This order depends on the bitmap format
@ -1177,10 +1177,10 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
|| [_colorSpace isEqualToString: NSDeviceRGBColorSpace])
{
unsigned int ir, ig, ib, ia;
float fr, fg, fb, fa;
float scale;
CGFloat fr, fg, fb, fa;
CGFloat scale;
scale = (float)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << _bitsPerSample) - 1);
[conv getRed: &fr green: &fg blue: &fb alpha: &fa];
if(_hasAlpha)
{
@ -1231,10 +1231,10 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
|| [_colorSpace isEqual: NSCalibratedWhiteColorSpace])
{
unsigned int iw, ia;
float fw, fa;
float scale;
CGFloat fw, fa;
CGFloat scale;
scale = (float)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << _bitsPerSample) - 1);
[conv getWhite: &fw alpha: &fa];
if (_hasAlpha)
{
@ -1270,10 +1270,10 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
|| [_colorSpace isEqual: NSCalibratedBlackColorSpace])
{
unsigned int iw, ia;
float fw, fa;
float scale;
CGFloat fw, fa;
CGFloat scale;
scale = (float)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << _bitsPerSample) - 1);
[conv getWhite: &fw alpha: &fa];
if (_hasAlpha)
{
@ -1308,10 +1308,10 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
else if ([_colorSpace isEqual: NSDeviceCMYKColorSpace])
{
unsigned int ic, im, iy, ib, ia;
float fc, fm, fy, fb, fa;
float scale;
CGFloat fc, fm, fy, fb, fa;
CGFloat scale;
scale = (float)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << _bitsPerSample) - 1);
[conv getCyan: &fc magenta: &fm yellow: &fy black: &fb alpha: &fa];
if(_hasAlpha)
{
@ -1988,10 +1988,10 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
}
else
{
float scale;
float alpha;
CGFloat scale;
CGFloat alpha;
scale = (float)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << _bitsPerSample) - 1);
for (y = 0; y < _pixelsHigh; y++)
{
for (x = 0; x < _pixelsWide; x++)
@ -2073,10 +2073,10 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
}
else
{
float scale;
float alpha;
CGFloat scale;
CGFloat alpha;
scale = (float)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << _bitsPerSample) - 1);
for (y = 0; y < _pixelsHigh; y++)
{
unsigned int a;
@ -2091,7 +2091,7 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
alpha = scale / a;
for (i = start; i < end; i++)
{
float new = pixelData[i] * alpha;
CGFloat new = pixelData[i] * alpha;
if (new > scale)
{
@ -2164,15 +2164,15 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
IMP setP = [new methodForSelector: setPSel];
unsigned int pixelData[5];
int x, y;
float _scale;
float scale;
CGFloat _scale;
CGFloat scale;
NSDebugLLog(@"NSImage", @"Converting %@ bitmap data", _colorSpace);
if (_bitsPerSample != bps)
{
_scale = (float)((1 << _bitsPerSample) - 1);
scale = (float)((1 << bps) - 1);
_scale = (CGFloat)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << bps) - 1);
}
else
{
@ -2185,7 +2185,7 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
for (x = 0; x < _pixelsWide; x++)
{
unsigned int iv[4], ia;
float fv[4], fa;
CGFloat fv[4], fa;
int i;
//[self getPixel: pixelData atX: x y: y];
@ -2304,8 +2304,8 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
IMP setP = [new methodForSelector: setPSel];
unsigned int pixelData[4];
int x, y;
float _scale;
float scale;
CGFloat _scale;
CGFloat scale;
int max = (1 << bps) - 1;
BOOL isWhite = [_colorSpace isEqualToString: NSCalibratedWhiteColorSpace]
|| [_colorSpace isEqualToString: NSDeviceWhiteColorSpace];
@ -2314,8 +2314,8 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
if (_bitsPerSample != bps)
{
_scale = (float)((1 << _bitsPerSample) - 1);
scale = (float)((1 << bps) - 1);
_scale = (CGFloat)((1 << _bitsPerSample) - 1);
scale = (CGFloat)((1 << bps) - 1);
}
else
{
@ -2328,7 +2328,7 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
for (x = 0; x < _pixelsWide; x++)
{
unsigned int iv, ia;
float fv, fa;
CGFloat fv, fa;
//[self getPixel: pixelData atX: x y: y];
getP(self, getPSel, pixelData, x, y);

610
Source/NSColor.m
View file

File diff suppressed because it is too large Load diff

4
Source/NSGraphicsContext.m
View file

@ -881,7 +881,7 @@ NSGraphicsContext *GSCurrentContext(void)
should have n components, where n corresponds to the number of
color components required to specify the color in the current
colorspace (Quartz). */
- (void) GSSetFillColor: (const float *)values
- (void) GSSetFillColor: (const CGFloat *)values
{
[self subclassResponsibility: _cmd];
}
@ -890,7 +890,7 @@ NSGraphicsContext *GSCurrentContext(void)
should have n components, where n corresponds to the number of
color components required to specify the color in the current
colorspace (Quartz). */
- (void) GSSetStrokeColor: (const float *)values
- (void) GSSetStrokeColor: (const CGFloat *)values
{
[self subclassResponsibility: _cmd];
}