gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-22 19:31:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Source/gsc/GSStreamContext.m:

Browse source 
* Source/gsc/GSContext.m:
* Source/gsc/GSGState.m:
* Headers/gsc/GSGStateOps.h: Change type for -GSSetFillColor: and
-GSSetStrokeColor: from float to CGFloat


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@34071 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2011-10-26 00:24:17 +00:00
parent b5d10eade8
commit c9c9397b6d
5 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2011-10-25 Eric Wasylishen <ewasylishen@gmail.com>
* Source/gsc/GSStreamContext.m:
* Source/gsc/GSContext.m:
* Source/gsc/GSGState.m:
* Headers/gsc/GSGStateOps.h: Change type for -GSSetFillColor: and
-GSSetStrokeColor: from float to CGFloat
2011-10-20 Fred Kiefer <FredKiefer@gmx.de>
* Source/cairo/CairoFontEnumerator.m: Define FC_WEIGHT_ULTRABLACK

4
Headers/gsc/GSGStateOps.h
View file

@ -46,8 +46,8 @@
- (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 */

4
Source/gsc/GSContext.m
View file

@ -318,12 +318,12 @@ static NSMapTable *gtable;
[gstate GSSetStrokeColorspace: spaceref];
}
- (void) GSSetFillColor: (const float *)values
- (void) GSSetFillColor: (const CGFloat *)values
{
[gstate GSSetFillColor: values];
}
- (void) GSSetStrokeColor: (const float *)values
- (void) GSSetStrokeColor: (const CGFloat *)values
{
[gstate GSSetStrokeColor: values];
}

30
Source/gsc/GSGState.m
View file

@ -317,7 +317,7 @@
[self setColor: &col state: COLOR_STROKE];
}
- (void) GSSetFillColor: (const float *)values
- (void) GSSetFillColor: (const CGFloat *)values
{
device_color_t dcolor;
NSColor *color;
@ -335,16 +335,21 @@
}
else
{
[color getRed: &dcolor.field[0]
green: &dcolor.field[1]
blue: &dcolor.field[2]
alpha: &dcolor.field[AINDEX]];
CGFloat r, g, b, a;
[color getRed: &r
green: &g
blue: &b
alpha: &a];
dcolor.field[0] = r;
dcolor.field[1] = g;
dcolor.field[2] = b;
dcolor.field[AINDEX] = a;
}
[self setColor: &dcolor state: COLOR_FILL];
}
- (void) GSSetStrokeColor: (const float *)values
- (void) GSSetStrokeColor: (const CGFloat *)values
{
device_color_t dcolor;
NSColor *color;
@ -362,10 +367,15 @@
}
else
{
[color getRed: &dcolor.field[0]
green: &dcolor.field[1]
blue: &dcolor.field[2]
alpha: &dcolor.field[AINDEX]];
CGFloat r, g, b, a;
[color getRed: &r
green: &g
blue: &b
alpha: &a];
dcolor.field[0] = r;
dcolor.field[1] = g;
dcolor.field[2] = b;
dcolor.field[AINDEX] = a;
}
[self setColor: &dcolor state: COLOR_STROKE];

4
Source/gsc/GSStreamContext.m
View file

@ -178,12 +178,12 @@ fpfloat(FILE *stream, float f)
fprintf(gstream, "setrgbcolor\n");
}
- (void) GSSetFillColor: (const float *)values
- (void) GSSetFillColor: (const CGFloat *)values
{
[self notImplemented: _cmd];
}
- (void) GSSetStrokeColor: (const float *)values
- (void) GSSetStrokeColor: (const CGFloat *)values
{
[self notImplemented: _cmd];
}