pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpexif: Fix compilation of unit tests with Delphi.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8062 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2021-07-13 07:40:43 +00:00
parent 0f89af8cd7
commit f335aef18e
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/fpexif/fpeexifreadwrite.pas
View File

@ -309,7 +309,11 @@ var
i: Integer; i: Integer;
ifdRec: TIFDRecord; ifdRec: TIFDRecord;
byteCount: Integer; byteCount: Integer;
{$IFDEF FPC}
data: TBytes = nil; data: TBytes = nil;
{$ELSE}
data: TBytes;
{$ENDIF}
n: Int64; n: Int64;
tagPos: Int64; tagPos: Int64;
newPos: Int64; newPos: Int64;

2
components/fpexif/fpemetadata.pas
View File

@ -423,7 +423,7 @@ begin
// Some images do not specify the segment length correctly and fill the // Some images do not specify the segment length correctly and fill the
// space to the next segment with zero bytes. // space to the next segment with zero bytes.
if (header.Key = 0) then begin if (header.Key = 0) then begin
repeat until AInputStream.ReadByte = $FF; repeat until ReadByte(AInputStream) = $FF;
AInputStream.Position := AInputStream.Position - 1; AInputStream.Position := AInputStream.Position - 1;
n := AInputStream.Read(header, SizeOf(Header)); n := AInputStream.Read(header, SizeOf(Header));
if n <> SizeOf(Header) then if n <> SizeOf(Header) then

2
components/fpexif/fpeutils.pas
View File

@ -1,4 +1,4 @@
unit fpeUtils; unit fpeUtils;
{$IFDEF FPC} {$IFDEF FPC}
{$mode ObjFPC}{$H+} {$mode ObjFPC}{$H+}

15
components/fpexif/tests/unittest/fpExifTests.lpi
View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="10"/> <Version Value="12"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags>
<CompatibilityMode Value="True"/>
</Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<Title Value="fpExifTests"/> <Title Value="fpExifTests"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
<UseXPManifest Value="True"/> <UseXPManifest Value="True"/>
@ -18,9 +20,10 @@
<Version Value="2"/> <Version Value="2"/>
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<local> <FormatVersion Value="2"/>
<FormatVersion Value="1"/> <Modes Count="1">
</local> <Mode0 Name="default"/>
</Modes>
</RunParams> </RunParams>
<RequiredPackages Count="3"> <RequiredPackages Count="3">
<Item1> <Item1>
@ -135,7 +138,7 @@
</SearchPaths> </SearchPaths>
<Linking> <Linking>
<Debugging> <Debugging>
<UseExternalDbgSyms Value="True"/> <DebugInfoType Value="dsDwarf2Set"/>
</Debugging> </Debugging>
<Options> <Options>
<Win32> <Win32>

9
components/fpexif/tests/unittest/fpExifTests_Delphi.dproj
View File

@ -7,7 +7,7 @@
<TargetedPlatforms>1</TargetedPlatforms> <TargetedPlatforms>1</TargetedPlatforms>
<AppType>Application</AppType> <AppType>Application</AppType>
<FrameworkType>VCL</FrameworkType> <FrameworkType>VCL</FrameworkType>
<ProjectVersion>18.2</ProjectVersion> <ProjectVersion>18.8</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@ -78,7 +78,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
<AppEnableHighDPI>true</AppEnableHighDPI> <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''"> <PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@ -87,11 +87,12 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes> <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
<AppEnableHighDPI>true</AppEnableHighDPI>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_MajorVer>1</VerInfo_MajorVer> <VerInfo_MajorVer>1</VerInfo_MajorVer>
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys> <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon> <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
<AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<DelphiCompile Include="$(MainSource)"> <DelphiCompile Include="$(MainSource)">
@ -106,7 +107,7 @@
<DCCReference Include="..\..\fpemetadata.pas"/> <DCCReference Include="..\..\fpemetadata.pas"/>
<DCCReference Include="..\..\fpestrconsts.pas"/> <DCCReference Include="..\..\fpestrconsts.pas"/>
<DCCReference Include="..\..\fpetags.pas"/> <DCCReference Include="..\..\fpetags.pas"/>
<DCCReference Include="..\..\fpeUtils.pas"/> <DCCReference Include="..\..\fpeutils.pas"/>
<DCCReference Include="common\fetexifbe.pas"/> <DCCReference Include="common\fetexifbe.pas"/>
<DCCReference Include="common\fetexifle.pas"/> <DCCReference Include="common\fetexifle.pas"/>
<DCCReference Include="common\fetiptc.pas"/> <DCCReference Include="common\fetiptc.pas"/>