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

Bugfix for initWithCoder:

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3582 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-01-21 10:41:23 +00:00
parent 74d82bc075
commit ec7651a9fb
2 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Jan 21 10:05:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSColor.m: Fixed initWithCoder: - was decoding an ivar twice
(bug report by Benhur-de-Oliveira.Stein@imag.fr) - also used @encode()
everywhere.
Tue Jan 19 10:00:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSScrollView.m: Tidied ([-tile]) and other stuff to do

49
Source/NSColor.m
View file

@ -1065,24 +1065,24 @@ static NSMutableDictionary *colorStrings = nil;
- (void)encodeWithCoder:aCoder
{
// Version 1
[aCoder encodeValueOfObjCType: "f" at: &RGB_component.red];
[aCoder encodeValueOfObjCType: "f" at: &RGB_component.green];
[aCoder encodeValueOfObjCType: "f" at: &RGB_component.blue];
[aCoder encodeValueOfObjCType: "f" at: &alpha_component];
[aCoder encodeValueOfObjCType: @encode(float) at: &RGB_component.red];
[aCoder encodeValueOfObjCType: @encode(float) at: &RGB_component.green];
[aCoder encodeValueOfObjCType: @encode(float) at: &RGB_component.blue];
[aCoder encodeValueOfObjCType: @encode(float) at: &alpha_component];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &is_clear];
// Version 2
[aCoder encodeObject: colorspace_name];
[aCoder encodeObject: catalog_name];
[aCoder encodeObject: color_name];
[aCoder encodeValueOfObjCType: "f" at: &CMYK_component.cyan];
[aCoder encodeValueOfObjCType: "f" at: &CMYK_component.magenta];
[aCoder encodeValueOfObjCType: "f" at: &CMYK_component.yellow];
[aCoder encodeValueOfObjCType: "f" at: &CMYK_component.black];
[aCoder encodeValueOfObjCType: "f" at: &HSB_component.hue];
[aCoder encodeValueOfObjCType: "f" at: &HSB_component.saturation];
[aCoder encodeValueOfObjCType: "f" at: &HSB_component.brightness];
[aCoder encodeValueOfObjCType: "f" at: &white_component];
[aCoder encodeValueOfObjCType: @encode(float) at: &CMYK_component.cyan];
[aCoder encodeValueOfObjCType: @encode(float) at: &CMYK_component.magenta];
[aCoder encodeValueOfObjCType: @encode(float) at: &CMYK_component.yellow];
[aCoder encodeValueOfObjCType: @encode(float) at: &CMYK_component.black];
[aCoder encodeValueOfObjCType: @encode(float) at: &HSB_component.hue];
[aCoder encodeValueOfObjCType: @encode(float) at: &HSB_component.saturation];
[aCoder encodeValueOfObjCType: @encode(float) at: &HSB_component.brightness];
[aCoder encodeValueOfObjCType: @encode(float) at: &white_component];
[aCoder encodeValueOfObjCType: @encode(int) at: &active_component];
[aCoder encodeValueOfObjCType: @encode(int) at: &valid_components];
}
@ -1092,10 +1092,10 @@ static NSMutableDictionary *colorStrings = nil;
NSString *s;
// Version 1
[aDecoder decodeValueOfObjCType: "f" at: &RGB_component.red];
[aDecoder decodeValueOfObjCType: "f" at: &RGB_component.green];
[aDecoder decodeValueOfObjCType: "f" at: &RGB_component.blue];
[aDecoder decodeValueOfObjCType: "f" at: &alpha_component];
[aDecoder decodeValueOfObjCType: @encode(float) at: &RGB_component.red];
[aDecoder decodeValueOfObjCType: @encode(float) at: &RGB_component.green];
[aDecoder decodeValueOfObjCType: @encode(float) at: &RGB_component.blue];
[aDecoder decodeValueOfObjCType: @encode(float) at: &alpha_component];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &is_clear];
// Get our class name
@ -1108,15 +1108,14 @@ static NSMutableDictionary *colorStrings = nil;
colorspace_name = [aDecoder decodeObject];
catalog_name = [aDecoder decodeObject];
color_name = [aDecoder decodeObject];
[aDecoder decodeValueOfObjCType: "f" at: &CMYK_component.cyan];
[aDecoder decodeValueOfObjCType: "f" at: &CMYK_component.magenta];
[aDecoder decodeValueOfObjCType: "f" at: &CMYK_component.yellow];
[aDecoder decodeValueOfObjCType: "f" at: &CMYK_component.black];
[aDecoder decodeValueOfObjCType: "f" at: &HSB_component.hue];
[aDecoder decodeValueOfObjCType: "f" at: &HSB_component.saturation];
[aDecoder decodeValueOfObjCType: "f" at: &HSB_component.brightness];
[aDecoder decodeValueOfObjCType: "f" at: &white_component];
[aDecoder decodeValueOfObjCType: "i" at: &active_component];
[aDecoder decodeValueOfObjCType: @encode(float) at: &CMYK_component.cyan];
[aDecoder decodeValueOfObjCType: @encode(float) at: &CMYK_component.magenta];
[aDecoder decodeValueOfObjCType: @encode(float) at: &CMYK_component.yellow];
[aDecoder decodeValueOfObjCType: @encode(float) at: &CMYK_component.black];
[aDecoder decodeValueOfObjCType: @encode(float) at: &HSB_component.hue];
[aDecoder decodeValueOfObjCType: @encode(float) at: &HSB_component.saturation];
[aDecoder decodeValueOfObjCType: @encode(float) at: &HSB_component.brightness];
[aDecoder decodeValueOfObjCType: @encode(float) at: &white_component];
[aDecoder decodeValueOfObjCType: @encode(int) at: &active_component];
[aDecoder decodeValueOfObjCType: @encode(int) at: &valid_components];
}