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

* Patch from Zilvinas Ledas to implement reading of 12-bit TIFFs

Browse Source 
git-svn-id: trunk@30690 -
This commit is contained in:
michael 2015-04-21 11:08:19 +00:00
parent ea9fc6581a
commit 2fd57665cf
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,8 +213,8 @@ begin
for i:=0 to SampleCnt-1 do begin
if SampleBits[i]>64 then
TiffError('Samples bigger than 64 bit not supported');
if not (SampleBits[i] in [1, 8, 16]) then
TiffError('Only samples of 1, 8 and 16 bit are supported');
if not (SampleBits[i] in [1, 8, 12, 16]) then
TiffError('Only samples of 1, 8, 12 and 16 bit are supported');
inc(SampleBitsPerPixel, SampleBits[i]);
end;
case IFD.PhotoMetricInterpretation of
@ -228,8 +228,8 @@ begin
IFD.AlphaBits:=AlphaBits;
end;
end;
if not (GrayBits in [1, 8, 16]) then
TiffError('gray image only supported with gray BitsPerSample 1, 8 or 16');
if not (GrayBits in [1, 8, 12, 16]) then
TiffError('gray image only supported with gray BitsPerSample 1, 8, 12 or 16');
if not (AlphaBits in [0, 8, 16]) then
TiffError('gray image only supported with alpha BitsPerSample 8 or 16');
end;
@ -366,6 +366,7 @@ procedure TFPReaderTiff.ReadImgValue(BitCount: Word; var Run: Pointer; x: dword;
Predictor: word; var LastValue: word; out Value: Word); inline;
var
BitNumber: byte;
Byte1, Byte2: byte;
begin
case BitCount of
1:
@ -391,6 +392,18 @@ begin
Value:=Value shl 8+Value;
inc(Run);
end;
12:
begin
Byte1 := PCUInt8(Run)^;
Byte2 := PCUInt8(Run+1)^;
if (x mod 2) = 0 then begin
Value := (((Byte1) shl 4) or (Byte2 shr 4)) * 16;
inc(Run);
end else begin
Value := (((Byte1 and $0F) shl 8) or Byte2) * 16;
inc(Run, 2);
end;
end;
16:
begin
Value:=FixEndian(PCUInt16(Run)^);
@ -1973,7 +1986,7 @@ begin
for i:=0 to ImageCount-1 do begin
CurImg:=Images[i];
NewSize:=Int64(CurImg.ImageWidth)*CurImg.ImageHeight;
if (NewSize<BestSize) then continue;
if (NewSize<=BestSize) then continue;
BestSize:=NewSize;
Best:=i;
end;