paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 01:06:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Changed clColor to colColor

Browse Source
This commit is contained in:
michael 2003-07-09 21:26:20 +00:00
parent 1b633246b9
commit b87c40ac19
5 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
fcl/image/fpcolors.inc
View File

@ -4,31 +4,31 @@ const
alphaTransparant = $0000; alphaTransparant = $0000;
alphaOpaque = $FFFF; alphaOpaque = $FFFF;
clTransparent: TFPColor = (Red: $0000; Green: $0000; Blue: $0000; Alpha: alphaTransparant); colTransparent: TFPColor = (Red: $0000; Green: $0000; Blue: $0000; Alpha: alphaTransparant);
clBlack : TFPColor = (Red: $0000; Green: $0000; Blue: $0000; Alpha: alphaOpaque); colBlack : TFPColor = (Red: $0000; Green: $0000; Blue: $0000; Alpha: alphaOpaque);
clBlue : TFPColor = (Red: $0000; Green: $0000; Blue: $ffff; Alpha: alphaOpaque); colBlue : TFPColor = (Red: $0000; Green: $0000; Blue: $ffff; Alpha: alphaOpaque);
clGreen : TFPColor = (Red: $0000; Green: $ffff; Blue: $0000; Alpha: alphaOpaque); colGreen : TFPColor = (Red: $0000; Green: $ffff; Blue: $0000; Alpha: alphaOpaque);
clCyan : TFPColor = (Red: $0000; Green: $ffff; Blue: $ffff; Alpha: alphaOpaque); colCyan : TFPColor = (Red: $0000; Green: $ffff; Blue: $ffff; Alpha: alphaOpaque);
clRed : TFPColor = (Red: $ffff; Green: $0000; Blue: $0000; Alpha: alphaOpaque); colRed : TFPColor = (Red: $ffff; Green: $0000; Blue: $0000; Alpha: alphaOpaque);
clMagenta : TFPColor = (Red: $ffff; Green: $0000; Blue: $ffff; Alpha: alphaOpaque); colMagenta : TFPColor = (Red: $ffff; Green: $0000; Blue: $ffff; Alpha: alphaOpaque);
clYellow : TFPColor = (Red: $ffff; Green: $ffff; Blue: $0000; Alpha: alphaOpaque); colYellow : TFPColor = (Red: $ffff; Green: $ffff; Blue: $0000; Alpha: alphaOpaque);
clWhite : TFPColor = (Red: $ffff; Green: $ffff; Blue: $ffff; Alpha: alphaOpaque); colWhite : TFPColor = (Red: $ffff; Green: $ffff; Blue: $ffff; Alpha: alphaOpaque);
clGray : TFPColor = (Red: $8000; Green: $8000; Blue: $8000; Alpha: alphaOpaque); colGray : TFPColor = (Red: $8000; Green: $8000; Blue: $8000; Alpha: alphaOpaque);
clLtGray : TFPColor = (Red: $c000; Green: $c000; Blue: $c000; Alpha: alphaOpaque); colLtGray : TFPColor = (Red: $c000; Green: $c000; Blue: $c000; Alpha: alphaOpaque);
clDkBlue : TFPColor = (Red: $0000; Green: $0000; Blue: $8000; Alpha: alphaOpaque); colDkBlue : TFPColor = (Red: $0000; Green: $0000; Blue: $8000; Alpha: alphaOpaque);
clDkGreen : TFPColor = (Red: $0000; Green: $8000; Blue: $0000; Alpha: alphaOpaque); colDkGreen : TFPColor = (Red: $0000; Green: $8000; Blue: $0000; Alpha: alphaOpaque);
clDkCyan : TFPColor = (Red: $0000; Green: $8000; Blue: $8000; Alpha: alphaOpaque); colDkCyan : TFPColor = (Red: $0000; Green: $8000; Blue: $8000; Alpha: alphaOpaque);
clDkRed : TFPColor = (Red: $8000; Green: $0000; Blue: $0000; Alpha: alphaOpaque); colDkRed : TFPColor = (Red: $8000; Green: $0000; Blue: $0000; Alpha: alphaOpaque);
clDkMagenta : TFPColor = (Red: $8000; Green: $0000; Blue: $8000; Alpha: alphaOpaque); colDkMagenta : TFPColor = (Red: $8000; Green: $0000; Blue: $8000; Alpha: alphaOpaque);
clDkYellow : TFPColor = (Red: $8000; Green: $8000; Blue: $0000; Alpha: alphaOpaque); colDkYellow : TFPColor = (Red: $8000; Green: $8000; Blue: $0000; Alpha: alphaOpaque);
clMaroon : TFPColor = (Red: $8000; Green: $0000; Blue: $0000; Alpha: alphaOpaque); colMaroon : TFPColor = (Red: $8000; Green: $0000; Blue: $0000; Alpha: alphaOpaque);
clLtGreen : TFPColor = (Red: $0000; Green: $8000; Blue: $0000; Alpha: alphaOpaque); colLtGreen : TFPColor = (Red: $0000; Green: $8000; Blue: $0000; Alpha: alphaOpaque);
clOlive : TFPColor = (Red: $8000; Green: $8000; Blue: $0000; Alpha: alphaOpaque); colOlive : TFPColor = (Red: $8000; Green: $8000; Blue: $0000; Alpha: alphaOpaque);
clNavy : TFPColor = (Red: $0000; Green: $0000; Blue: $8000; Alpha: alphaOpaque); colNavy : TFPColor = (Red: $0000; Green: $0000; Blue: $8000; Alpha: alphaOpaque);
clPurple : TFPColor = (Red: $8000; Green: $0000; Blue: $8000; Alpha: alphaOpaque); colPurple : TFPColor = (Red: $8000; Green: $0000; Blue: $8000; Alpha: alphaOpaque);
clTeal : TFPColor = (Red: $0000; Green: $8000; Blue: $8000; Alpha: alphaOpaque); colTeal : TFPColor = (Red: $0000; Green: $8000; Blue: $8000; Alpha: alphaOpaque);
clSilver : TFPColor = (Red: $c000; Green: $c000; Blue: $c000; Alpha: alphaOpaque); colSilver : TFPColor = (Red: $c000; Green: $c000; Blue: $c000; Alpha: alphaOpaque);
clLime : TFPColor = (Red: $0000; Green: $ffff; Blue: $0000; Alpha: alphaOpaque); colLime : TFPColor = (Red: $0000; Green: $ffff; Blue: $0000; Alpha: alphaOpaque);
clFuchsia : TFPColor = (Red: $ffff; Green: $0000; Blue: $ffff; Alpha: alphaOpaque); colFuchsia : TFPColor = (Red: $ffff; Green: $0000; Blue: $ffff; Alpha: alphaOpaque);
clAqua : TFPColor = (Red: $0000; Green: $ffff; Blue: $ffff; Alpha: alphaOpaque); colAqua : TFPColor = (Red: $0000; Green: $ffff; Blue: $ffff; Alpha: alphaOpaque);

2
fcl/image/fppalette.inc
View File

@ -115,7 +115,7 @@ begin
FData := NewData; FData := NewData;
end; end;
for o := FCount to Value-1 do for o := FCount to Value-1 do
FData^[o] := clBlack; FData^[o] := colBlack;
FCount := Value; FCount := Value;
end; end;
end; end;

2
fcl/image/fpreadpng.pp
View File

@ -237,7 +237,7 @@ procedure TFPReaderPNG.SetColorTrPixel (x,y:integer; CD : TColordata);
var c : TFPColor; var c : TFPColor;
begin // both PNG and Img work without palette, and there is a transparency colordata begin // both PNG and Img work without palette, and there is a transparency colordata
if TransparentDataValue = CD then if TransparentDataValue = CD then
c := clTransparent c := colTransparent
else else
c := ConvertColor (CD,CFmt); c := ConvertColor (CD,CFmt);
TheImage.Colors[x,y] := c; TheImage.Colors[x,y] := c;

58
fcl/image/fpreadxpm.pp
View File

@ -77,63 +77,63 @@ function TFPReaderXPM.NameToColor(s : string) : TFPColor;
begin begin
s := lowercase (s); s := lowercase (s);
if s = 'transparent' then if s = 'transparent' then
result := clTransparent result := colTransparent
else if s = 'none' then else if s = 'none' then
result := clTransparent result := colTransparent
else if s = 'black' then else if s = 'black' then
result := clBlack result := colBlack
else if s = 'blue' then else if s = 'blue' then
result := clBlue result := colBlue
else if s = 'green' then else if s = 'green' then
result := clGreen result := colGreen
else if s = 'cyan' then else if s = 'cyan' then
result := clCyan result := colCyan
else if s = 'red' then else if s = 'red' then
result := clRed result := colRed
else if s = 'magenta' then else if s = 'magenta' then
result := clMagenta result := colMagenta
else if s = 'yellow' then else if s = 'yellow' then
result := clYellow result := colYellow
else if s = 'white' then else if s = 'white' then
result := clWhite result := colWhite
else if s = 'gray' then else if s = 'gray' then
result := clGray result := colGray
else if s = 'ltgray' then else if s = 'ltgray' then
result := clLtGray result := colLtGray
else if s = 'dkblue' then else if s = 'dkblue' then
result := clDkBlue result := colDkBlue
else if s = 'dkgreen' then else if s = 'dkgreen' then
result := clDkGreen result := colDkGreen
else if s = 'dkcyan' then else if s = 'dkcyan' then
result := clDkCyan result := colDkCyan
else if s = 'dkred' then else if s = 'dkred' then
result := clDkRed result := colDkRed
else if s = 'dkmagenta' then else if s = 'dkmagenta' then
result := clDkMagenta result := colDkMagenta
else if s = 'dkyellow' then else if s = 'dkyellow' then
result := clDkYellow result := colDkYellow
else if s = 'maroon' then else if s = 'maroon' then
result := clMaroon result := colMaroon
else if s = 'ltgreen' then else if s = 'ltgreen' then
result := clLtGreen result := colLtGreen
else if s = 'olive' then else if s = 'olive' then
result := clOlive result := colOlive
else if s = 'navy' then else if s = 'navy' then
result := clNavy result := colNavy
else if s = 'purple' then else if s = 'purple' then
result := clPurple result := colPurple
else if s = 'teal' then else if s = 'teal' then
result := clTeal result := colTeal
else if s = 'silver' then else if s = 'silver' then
result := clSilver result := colSilver
else if s = 'lime' then else if s = 'lime' then
result := clLime result := colLime
else if s = 'fuchsia' then else if s = 'fuchsia' then
result := clFuchsia result := colFuchsia
else if s = 'aqua' then else if s = 'aqua' then
result := clAqua result := colAqua
else else
result := clTransparent; result := colTransparent;
end; end;
function TFPReaderXPM.DiminishWhiteSpace (s : string) : string; function TFPReaderXPM.DiminishWhiteSpace (s : string) : string;

2
fcl/image/fpwritexpm.pp
View File

@ -87,7 +87,7 @@ begin
l.add (format('"%d %d %d %d",',[img.width,img.height,c,len])); l.add (format('"%d %d %d %d",',[img.width,img.height,c,len]));
for r := 0 to c-1 do for r := 0 to c-1 do
begin begin
if img.palette[r] <> clTransparent then if img.palette[r] <> colTransparent then
l.Add (format('"%s c #%s",',[p[r],ColorToHex(img.palette.color[r],12)])) l.Add (format('"%s c #%s",',[p[r],ColorToHex(img.palette.color[r],12)]))
else else
l.Add (format('"%s c None",',[p[r]])); l.Add (format('"%s c None",',[p[r]]));