paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-22 20:51:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Laurent (wile64@gmail.com) to read CMYK files

Browse Source 
git-svn-id: trunk@10402 -
This commit is contained in:
michael 2008-02-28 18:22:12 +00:00
parent 2df6010386
commit d25c28eaf4
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/fcl-image/src/fpreadjpeg.pas
View File

@ -201,6 +201,19 @@ var
end; end;
end; end;
function CorrectCMYK(const C: TFPColor): TFPColor;
var
MinColor: word;
begin
if C.red<C.green then MinColor:=C.red
else MinColor:= C.green;
if C.blue<MinColor then MinColor:= C.blue;
if MinColor+ C.alpha>$FF then MinColor:=$FF-C.alpha;
Result.red:=(C.red-MinColor) shl 8;
Result.green:=(C.green-MinColor) shl 8;
Result.blue:=(C.blue-MinColor) shl 8;
Result.alpha:=alphaOpaque;
end;
procedure ReadPixels; procedure ReadPixels;
var var
Continue: Boolean; Continue: Boolean;
@ -231,6 +244,15 @@ var
while (FInfo.output_scanline < FInfo.output_height) do begin while (FInfo.output_scanline < FInfo.output_height) do begin
LinesRead := jpeg_read_scanlines(@FInfo, SampArray, 1); LinesRead := jpeg_read_scanlines(@FInfo, SampArray, 1);
if LinesRead<1 then break; if LinesRead<1 then break;
if (FInfo.jpeg_color_space = JCS_CMYK) then
for x:=0 to FInfo.output_width-1 do begin
Color.Red:=SampRow^[x*4+0];
Color.Green:=SampRow^[x*4+1];
Color.Blue:=SampRow^[x*4+2];
Color.alpha:=SampRow^[x*4+3];
Img.Colors[x,y]:=CorrectCMYK(Color);
end
else
for x:=0 to FInfo.output_width-1 do begin for x:=0 to FInfo.output_width-1 do begin
Color.Red:=SampRow^[x*3+0] shl 8; Color.Red:=SampRow^[x*3+0] shl 8;
Color.Green:=SampRow^[x*3+1] shl 8; Color.Green:=SampRow^[x*3+1] shl 8;