paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-21 16:28:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: Make IntfGraphics DisableLCLTIFF aware. Issue #35038. Patch from Alexey T.

Browse Source 
git-svn-id: trunk@60364 -
This commit is contained in:
michl 2019-02-08 17:18:07 +00:00
parent a85a3d9e59
commit c323c396de
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/intfgraphics.pas
View File

@ -26,8 +26,13 @@ interface
uses uses
// RTL + FCL // RTL + FCL
Classes, SysUtils, Math, fpImage, FPReadBMP, FPWriteBMP, BMPComn, Classes, SysUtils, Math, fpImage,
FPReadPNG, FPWritePNG, FPReadTiff, FPWriteTiff, FPTiffCmn, Laz_AVL_Tree, FPReadBMP, FPWriteBMP, BMPComn,
FPReadPNG, FPWritePNG,
{$IFNDEF DisableLCLTIFF}
FPReadTiff, FPWriteTiff, FPTiffCmn,
{$ENDIF}
Laz_AVL_Tree,
// LazUtils // LazUtils
FPCAdds, LazLoggerBase, LazTracer, FPCAdds, LazLoggerBase, LazTracer,
// LCL // LCL
@ -581,6 +586,8 @@ type
procedure Finalize; procedure Finalize;
end; end;
{$IFNDEF DisableLCLTIFF}
{ TLazReaderTiff } { TLazReaderTiff }
const const
@ -634,6 +641,7 @@ type
procedure Finalize; procedure Finalize;
end; end;
{$ENDIF} //DisableLCLTIFF
{ TLazReaderIcnsPart } { TLazReaderIcnsPart }
@ -6148,6 +6156,8 @@ begin
Result := -1; Result := -1;
end; end;
{$IFNDEF DisableLCLTIFF}
{ TLazReaderTiff } { TLazReaderTiff }
{$IFDEF OldTiffCreateImageHook} {$IFDEF OldTiffCreateImageHook}
@ -6321,6 +6331,8 @@ begin
Result := -1; Result := -1;
end; end;
{$ENDIF} //DisableLCLTIFF
{ TLazReaderIcnsPart } { TLazReaderIcnsPart }
function TLazReaderIcnsPart.InternalCheck(Str: TStream): boolean; function TLazReaderIcnsPart.InternalCheck(Str: TStream): boolean;