From 1e2bcbe53259b37f066fab1ad05a504f4c7e52d7 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 13 Jan 2018 15:09:34 +0000 Subject: [PATCH] fpexif: Fix compilation down to Laz 1.2 git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6131 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpexif/fpeutils.pas | 5 +++++ components/fpexif/fpexif_pkg.pas | 3 +-- .../fpexif/tests/multiread/MultiRead_Laz.res | Bin 139052 -> 138696 bytes .../tests/readwrite/ReadWriteTest_Laz.res | Bin 1779 -> 1422 bytes 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/fpexif/fpeutils.pas b/components/fpexif/fpeutils.pas index ffe18810a..9bfcf0ca5 100644 --- a/components/fpexif/fpeutils.pas +++ b/components/fpexif/fpeutils.pas @@ -20,6 +20,11 @@ uses type {$IFDEF FPC} + + {$IF FPC_FULLVERSION < 3000200} + TStringArray = array of string; + {$ENDIF} + TInt64List = specialize TFPGList; {$ELSE} TInt64List = class(TList) diff --git a/components/fpexif/fpexif_pkg.pas b/components/fpexif/fpexif_pkg.pas index 191f397f8..5ff57c3e5 100644 --- a/components/fpexif/fpexif_pkg.pas +++ b/components/fpexif/fpexif_pkg.pas @@ -4,12 +4,11 @@ unit fpexif_pkg; -{$warn 5023 off : no warning about unused units} interface uses fpeGlobal, fpeTags, fpeUtils, fpeMetadata, fpeExifReadWrite, - fpeIptcReadWrite, fpeExifData, fpeIptcData, fpeStrConsts, fpemakernote; + fpeIptcReadWrite, fpeExifData, fpeIptcData, fpeStrConsts, fpeMakerNote; implementation diff --git a/components/fpexif/tests/multiread/MultiRead_Laz.res b/components/fpexif/tests/multiread/MultiRead_Laz.res index f6e8499568f21121986c715951291349244aeef3..e994dfa65a96d79259e5ee4940a4dbaf7a725d38 100644 GIT binary patch delta 63 zcmZ3pkK@E{jtL4(eykIf{%)FHR^5Wpsl9J54^kRrgTcwPWk^(Dz{o>?| z)ZD~kz1+;?qWt3gv=Y7K{9OHDUr&7_0|Qh2a8%7ocD!5)3JNwU1(}ZJiAAY)ZizX? zsW$p>K1kX|A7XJmn$2LnP^Y6wk>DspGaQaWwi;}_KEl%=t6|PU3N@fGNVGULHz}vm SuDPGJy`PnFdp|3ar33&|X@vp+ diff --git a/components/fpexif/tests/readwrite/ReadWriteTest_Laz.res b/components/fpexif/tests/readwrite/ReadWriteTest_Laz.res index 0ad004b9d97928b9d3a42fa745f31fc0da4dfdb5..e1df0e994f40ffa3fe25cf9b7348db6efe4ef698 100644 GIT binary patch delta 47 zcmey&+s8dYfys|`qSAl%$o$eG$AW^%8jLoq3K^+Ishd+6rC7La^b?DVQ*)DYD(wJr C_zyDx delta 373 zcmeC<{>(c;foU__M5X`ijs*pNiMgqhH5hF+XEI8$$Sc?+7Uz~3TO}40x