From 652eaac2d4cdf8d1e4e6ff35a85b7da678313b49 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Tue, 13 Jul 2021 07:48:15 +0000 Subject: [PATCH] fpexif: Fix compilation of unit test project with Delphi 7. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8063 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpexif/fpeexifreadwrite.pas | 2 ++ components/fpexif/fpemetadata.pas | 4 ++++ components/fpexif/fpeutils.pas | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/components/fpexif/fpeexifreadwrite.pas b/components/fpexif/fpeexifreadwrite.pas index c5165b2f6..5e9bd9666 100644 --- a/components/fpexif/fpeexifreadwrite.pas +++ b/components/fpexif/fpeexifreadwrite.pas @@ -318,7 +318,9 @@ var tagPos: Int64; newPos: Int64; begin + {$IFDEF FPC} ifdRec := Default(TIFDRecord); + {$ENDIF} // Read count of directory entries numRecords := FixEndian16(ReadWord(AStream)); diff --git a/components/fpexif/fpemetadata.pas b/components/fpexif/fpemetadata.pas index 16e4554ef..a6c0ccd5d 100644 --- a/components/fpexif/fpemetadata.pas +++ b/components/fpexif/fpemetadata.pas @@ -402,7 +402,11 @@ var headerSize: Word; n, count: Int64; savedPos: Int64; + {$IFDEF FPC} s: RawByteString; + {$ELSE} + s: String; + {$ENDIF} begin // Write the header segment and all metadata segments stored in TImgInfo // to the beginning of the stream diff --git a/components/fpexif/fpeutils.pas b/components/fpexif/fpeutils.pas index 61a6ed7d0..695672cd2 100644 --- a/components/fpexif/fpeutils.pas +++ b/components/fpexif/fpeutils.pas @@ -1,4 +1,4 @@ -unit fpeUtils; +unit fpeUtils; {$IFDEF FPC} {$mode ObjFPC}{$H+}