paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-06 07:47:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

lcl: tiff: fixed compilation of fpc 2.6.1

Browse Source 
git-svn-id: trunk@38511 -
This commit is contained in:
mattias 2012-09-03 21:14:08 +00:00
parent f93076acb0
commit 1143e333ac
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/include/tiffimage.inc
View File

@ -31,7 +31,7 @@ var
D, T: TDateTime; D, T: TDateTime;
S: String; S: String;
YY, MM, DD, HH, NN, SS: Integer; YY, MM, DD, HH, NN, SS: Integer;
{$IF FPC_FULLVERSION>=20701} {$IF FPC_FULLVERSION>=20601}
IFD: TTiffIFD; IFD: TTiffIFD;
{$ELSE} {$ELSE}
IFD: TTiffIDF; IFD: TTiffIDF;

14
lcl/intfgraphics.pas
View File

@ -623,10 +623,14 @@ const
LazTiffSoftware = LazTiffExtraPrefix + 'Software'; LazTiffSoftware = LazTiffExtraPrefix + 'Software';
type type
{$IF FPC_FULLVERSION<20601}
{$DEFINE OldTiffCreateImageHook}
{$ENDIF}
TLazReaderTiff = class(TFPReaderTiff, ILazImageReader) TLazReaderTiff = class(TFPReaderTiff, ILazImageReader)
private private
FUpdateDescription: Boolean; FUpdateDescription: Boolean;
{$IF FPC_FULLVERSION<20701} {$IFDEF OldTiffCreateImageHook}
// the OnCreateImage event is "abused" to update the description after the // the OnCreateImage event is "abused" to update the description after the
// format and before the image is read // format and before the image is read
FOrgEvent: TTiffCreateCompatibleImgEvent; FOrgEvent: TTiffCreateCompatibleImgEvent;
@ -5999,7 +6003,7 @@ end;
{ TLazReaderTiff } { TLazReaderTiff }
{$IF FPC_FULLVERSION<20701} {$IFDEF OldTiffCreateImageHook}
procedure TLazReaderTiff.CreateImageHook(Sender: TFPReaderTiff; var NewImage: TFPCustomImage); procedure TLazReaderTiff.CreateImageHook(Sender: TFPReaderTiff; var NewImage: TFPCustomImage);
begin begin
if Assigned(FOrgEvent) then FOrgEvent(Sender, NewImage); if Assigned(FOrgEvent) then FOrgEvent(Sender, NewImage);
@ -6009,12 +6013,12 @@ end;
{$ENDIF} {$ENDIF}
procedure TLazReaderTiff.DoCreateImage( procedure TLazReaderTiff.DoCreateImage(
ImgFileDir: {$IF FPC_FULLVERSION<20701}TTiffIDF{$ELSE}TTiffIFD{$ENDIF}); ImgFileDir: {$IFDEF OldTiffCreateImageHook}TTiffIDF{$ELSE}TTiffIFD{$ENDIF});
var var
Desc: TRawImageDescription; Desc: TRawImageDescription;
IsAlpha, IsGray: Boolean; IsAlpha, IsGray: Boolean;
begin begin
{$IF FPC_FULLVERSION>=20701} {$IFNDEF OldTiffCreateImageHook}
inherited; inherited;
{$ENDIF} {$ENDIF}
@ -6089,7 +6093,7 @@ end;
procedure TLazReaderTiff.InternalRead(Str: TStream; Img: TFPCustomImage); procedure TLazReaderTiff.InternalRead(Str: TStream; Img: TFPCustomImage);
begin begin
{$IF FPC_FULLVERSION<20701} {$IFDEF OldTiffCreateImageHook}
FOrgEvent := OnCreateImage; FOrgEvent := OnCreateImage;
OnCreateImage := @CreateImageHook; OnCreateImage := @CreateImageHook;
inherited InternalRead(Str, Img); inherited InternalRead(Str, Img);