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

tif: open RGB with 4 samples as RGBA, issue #20148

Browse Source 
git-svn-id: trunk@28747 -
This commit is contained in:
Mattias Gaertner 2014-10-05 15:40:25 +00:00
parent 6e671e2e85
commit 9cf1499851
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/fcl-image/src/fpreadtiff.pas
View File

@ -189,8 +189,8 @@ begin
0, 1: if SampleCnt-ExtraSampleCnt<>1 then
TiffError('gray images expect one sample per pixel, but found '+IntToStr(
SampleCnt));
2: if SampleCnt-ExtraSampleCnt<>3 then
TiffError('rgb images expect three samples per pixel, but found '+IntToStr(
2: if (SampleCnt-ExtraSampleCnt<>3) and (SampleCnt-ExtraSampleCnt<>4) then
TiffError('rgb(a) images expect three or four samples per pixel, but found '+IntToStr(
SampleCnt));
3: if SampleCnt-ExtraSampleCnt<>1 then
TiffError('palette images expect one sample per pixel, but found '+IntToStr(
@ -238,10 +238,15 @@ begin
RedBits:=SampleBits[0];
GreenBits:=SampleBits[1];
BlueBits:=SampleBits[2];
if SampleCnt=4 then
AlphaBits:=SampleBits[3];
IFD.RedBits:=RedBits;
IFD.GreenBits:=GreenBits;
IFD.BlueBits:=BlueBits;
IFD.AlphaBits:=0;
if SampleCnt=4 then
IFD.AlphaBits:=AlphaBits
else
IFD.AlphaBits:=0;
for i:=0 to ExtraSampleCnt-1 do begin
//writeln(' ',i,'/',ExtraSampleCnt,' Type=',ExtraSamples[i],' Count=',SampleBits[3+i]);
if ExtraSamples[i] in [1, 2] then begin
@ -1822,7 +1827,10 @@ begin
ReadImgValue(RedBits,Run,cx,IFD.Predictor,LastRedValue,RedValue);
ReadImgValue(GreenBits,Run,cx,IFD.Predictor,LastGreenValue,GreenValue);
ReadImgValue(BlueBits,Run,cx,IFD.Predictor,LastBlueValue,BlueValue);
AlphaValue:=alphaOpaque;
if SampleBitsPerPixel=32 then
ReadImgValue(AlphaBits,Run,cx,IFD.Predictor,LastAlphaValue,AlphaValue)
else
AlphaValue:=alphaOpaque;
for i:=0 to ExtraSampleCnt-1 do begin
if ExtraSamples[i] in [1,2] then begin
ReadImgValue(AlphaBits,Run,cx,IFD.Predictor,LastAlphaValue,AlphaValue);