Fixed for Delphi XE2

Signed-off-by: Laentir Valetov <laex@bk.ru>
This commit is contained in:
Laentir Valetov 2017-10-23 03:37:17 +04:00
parent 70bd6c56b3
commit 4477130d7f
22 changed files with 597 additions and 24 deletions

View File

@ -16,9 +16,11 @@
{$POINTERMATH ON} {$POINTERMATH ON}
{.$DEFINE SAFELOADLIB} {.$DEFINE SAFELOADLIB}
{$IF DEFINED(SAFELOADLIB) AND DEFINED(DEBUG)} {$IFDEF SAFELOADLIB}
{$IFDEF DEBUG}
{.$DEFINE USE_STUB_FOR_MISS_FUNC} {.$DEFINE USE_STUB_FOR_MISS_FUNC}
{$ENDIF} {$ENDIF}
{$ENDIF}
{$WARN SYMBOL_DEPRECATED OFF} {$WARN SYMBOL_DEPRECATED OFF}
{$WARN SYMBOL_PLATFORM OFF} {$WARN SYMBOL_PLATFORM OFF}
@ -1693,7 +1695,7 @@
{$IFOPT X+} {$DEFINE EXTENDEDSYNTAX_ON} {$ENDIF} {$IFOPT X+} {$DEFINE EXTENDEDSYNTAX_ON} {$ENDIF}
//{$IF DECLARED(FireMonkeyVersion)} //{$IF DECLARED(FireMonkeyVersion)}
{$IF DEFINED(FireMonkeyVersion)} {$IFDEF FireMonkeyVersion}
{$DEFINE HAS_FMX} {$DEFINE HAS_FMX}
{$ELSE} {$ELSE}
{$DEFINE HAS_VCL} {$DEFINE HAS_VCL}

View File

@ -0,0 +1,60 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{CE0FFB7D-745E-4080-827E-50E4D21B2B30}</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<Projects Include="dclCommonOpenCV230.dproj">
<Dependencies/>
</Projects>
<Projects Include="dclFFMSource230.dproj">
<Dependencies/>
</Projects>
<Projects Include="dclVCLOpenCV230.dproj">
<Dependencies/>
</Projects>
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Default.Personality.12</Borland.Personality>
<Borland.ProjectType/>
<BorlandProject>
<Default.Personality/>
</BorlandProject>
</ProjectExtensions>
<Target Name="dclCommonOpenCV230">
<MSBuild Projects="dclCommonOpenCV230.dproj"/>
</Target>
<Target Name="dclCommonOpenCV230:Clean">
<MSBuild Projects="dclCommonOpenCV230.dproj" Targets="Clean"/>
</Target>
<Target Name="dclCommonOpenCV230:Make">
<MSBuild Projects="dclCommonOpenCV230.dproj" Targets="Make"/>
</Target>
<Target Name="dclFFMSource230">
<MSBuild Projects="dclFFMSource230.dproj"/>
</Target>
<Target Name="dclFFMSource230:Clean">
<MSBuild Projects="dclFFMSource230.dproj" Targets="Clean"/>
</Target>
<Target Name="dclFFMSource230:Make">
<MSBuild Projects="dclFFMSource230.dproj" Targets="Make"/>
</Target>
<Target Name="dclVCLOpenCV230">
<MSBuild Projects="dclVCLOpenCV230.dproj"/>
</Target>
<Target Name="dclVCLOpenCV230:Clean">
<MSBuild Projects="dclVCLOpenCV230.dproj" Targets="Clean"/>
</Target>
<Target Name="dclVCLOpenCV230:Make">
<MSBuild Projects="dclVCLOpenCV230.dproj" Targets="Make"/>
</Target>
<Target Name="Build">
<CallTarget Targets="dclCommonOpenCV230;dclFFMSource230;dclVCLOpenCV230"/>
</Target>
<Target Name="Clean">
<CallTarget Targets="dclCommonOpenCV230:Clean;dclFFMSource230:Clean;dclVCLOpenCV230:Clean"/>
</Target>
<Target Name="Make">
<CallTarget Targets="dclCommonOpenCV230:Make;dclFFMSource230:Make;dclVCLOpenCV230:Make"/>
</Target>
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')" Project="$(BDS)\Bin\CodeGear.Group.Targets"/>
</Project>

Binary file not shown.

View File

@ -0,0 +1,40 @@
package dclCommonOpenCV230;
{$R *.res}
{$R 'dclCommonOpenCV.res'}
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION OFF}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES ON}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DEFINE DEBUG}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV common component'}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}
requires
designide;
contains
ocv.comp.IOProperties in '..\ocv.comp.IOProperties.pas',
ocv.comp.Register in '..\ocv.comp.Register.pas';
end.

View File

@ -0,0 +1,132 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{8C265682-78ED-44DC-84D0-4F034EFB3173}</ProjectGuid>
<MainSource>dclCommonOpenCV230.dpk</MainSource>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Package</AppType>
<FrameworkType>None</FrameworkType>
<ProjectVersion>13.4</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
<Cfg_1>true</Cfg_1>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<DesignOnlyPackage>true</DesignOnlyPackage>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<GenPackage>true</GenPackage>
<DCC_ImageBase>00400000</DCC_ImageBase>
<DCC_Description>OpenCV common component</DCC_Description>
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
<DCC_N>false</DCC_N>
<DCC_S>false</DCC_S>
<GenDll>true</GenDll>
<DCC_K>false</DCC_K>
<VerInfo_Locale>1049</VerInfo_Locale>
<DCC_E>false</DCC_E>
<DCC_F>false</DCC_F>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
<DCC_DebugInformation>false</DCC_DebugInformation>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
<DCC_Optimize>false</DCC_Optimize>
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
</PropertyGroup>
<ItemGroup>
<DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="designide.dcp"/>
<DCCReference Include="..\ocv.comp.IOProperties.pas"/>
<DCCReference Include="..\ocv.comp.Register.pas"/>
<RcCompile Include="..\..\..\resource\facedetectxml\haarcascade.rc">
<Form>haarcascade.res</Form>
</RcCompile>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
</BuildConfiguration>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
<BuildConfiguration Include="Release">
<Key>Cfg_1</Key>
<CfgParent>Base</CfgParent>
</BuildConfiguration>
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<Delphi.Personality>
<Source>
<Source Name="MainSource">dclCommonOpenCV230.dpk</Source>
</Source>
<VersionInfo>
<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">1</VersionInfo>
<VersionInfo Name="MinorVer">0</VersionInfo>
<VersionInfo Name="Release">0</VersionInfo>
<VersionInfo Name="Build">0</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
<VersionInfo Name="Special">False</VersionInfo>
<VersionInfo Name="Private">False</VersionInfo>
<VersionInfo Name="DLL">False</VersionInfo>
<VersionInfo Name="Locale">1049</VersionInfo>
<VersionInfo Name="CodePage">1251</VersionInfo>
</VersionInfo>
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"/>
<VersionInfoKeys Name="FileDescription"/>
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"/>
<VersionInfoKeys Name="LegalCopyright"/>
<VersionInfoKeys Name="LegalTrademarks"/>
<VersionInfoKeys Name="OriginalFilename"/>
<VersionInfoKeys Name="ProductName"/>
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
<VersionInfoKeys Name="Comments"/>
</VersionInfoKeys>
</Delphi.Personality>
<Platforms>
<Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
</ProjectExtensions>
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
</Project>

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,40 @@
package dclFFMSource230;
{$R *.res}
{$R 'dclFFMSource.res'}
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION OFF}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES ON}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DEFINE DEBUG}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV FFMPEG component'}
{$IMPLICITBUILD ON}
requires
designide,
dclCommonOpenCV230;
contains
ocv.comp.RegisterFFM in '..\ocv.comp.RegisterFFM.pas',
ocv.comp.FFMSource in '..\ocv.comp.FFMSource.pas';
end.

View File

@ -0,0 +1,128 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{1CE053CD-F90E-4527-B4B9-76C8E5073A59}</ProjectGuid>
<MainSource>dclFFMSource230.dpk</MainSource>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Package</AppType>
<FrameworkType>None</FrameworkType>
<ProjectVersion>13.4</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
<Cfg_1>true</Cfg_1>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<GenPackage>true</GenPackage>
<VerInfo_Locale>1049</VerInfo_Locale>
<DCC_Description>OpenCV FFMPEG component</DCC_Description>
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
<DCC_ImageBase>00400000</DCC_ImageBase>
<DCC_N>false</DCC_N>
<DCC_S>false</DCC_S>
<GenDll>true</GenDll>
<DCC_E>false</DCC_E>
<DCC_F>false</DCC_F>
<DCC_K>false</DCC_K>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
<DCC_DebugInformation>false</DCC_DebugInformation>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
<DCC_Optimize>false</DCC_Optimize>
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
</PropertyGroup>
<ItemGroup>
<DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="designide.dcp"/>
<DCCReference Include="dclCommonOpenCV230.dcp"/>
<DCCReference Include="..\ocv.comp.RegisterFFM.pas"/>
<DCCReference Include="..\ocv.comp.FFMSource.pas"/>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
</BuildConfiguration>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
<BuildConfiguration Include="Release">
<Key>Cfg_1</Key>
<CfgParent>Base</CfgParent>
</BuildConfiguration>
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<Delphi.Personality>
<Source>
<Source Name="MainSource">dclFFMSource230.dpk</Source>
</Source>
<VersionInfo>
<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">1</VersionInfo>
<VersionInfo Name="MinorVer">0</VersionInfo>
<VersionInfo Name="Release">0</VersionInfo>
<VersionInfo Name="Build">0</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
<VersionInfo Name="Special">False</VersionInfo>
<VersionInfo Name="Private">False</VersionInfo>
<VersionInfo Name="DLL">False</VersionInfo>
<VersionInfo Name="Locale">1049</VersionInfo>
<VersionInfo Name="CodePage">1251</VersionInfo>
</VersionInfo>
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"/>
<VersionInfoKeys Name="FileDescription"/>
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"/>
<VersionInfoKeys Name="LegalCopyright"/>
<VersionInfoKeys Name="LegalTrademarks"/>
<VersionInfoKeys Name="OriginalFilename"/>
<VersionInfoKeys Name="ProductName"/>
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
<VersionInfoKeys Name="Comments"/>
</VersionInfoKeys>
</Delphi.Personality>
<Platforms>
<Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
</ProjectExtensions>
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
</Project>

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,41 @@
package dclVCLOpenCV230;
{$R *.res}
{$R 'dclVCLOpenCV.res'}
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION OFF}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES ON}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DEFINE DEBUG}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV VCL component'}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}
requires
designide,
dclCommonOpenCV230;
contains
ocv.comp.RegisterVCL in '..\ocv.comp.RegisterVCL.pas',
ocv.comp.View in '..\ocv.comp.View.pas';
end.

View File

@ -0,0 +1,130 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{586353DE-04E7-478D-9434-DA90D7B5E4A0}</ProjectGuid>
<MainSource>dclVCLOpenCV230.dpk</MainSource>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config>
<TargetedPlatforms>1</TargetedPlatforms>
<AppType>Package</AppType>
<FrameworkType>None</FrameworkType>
<ProjectVersion>13.4</ProjectVersion>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
<Cfg_1>true</Cfg_1>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<DesignOnlyPackage>true</DesignOnlyPackage>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<GenPackage>true</GenPackage>
<DCC_ImageBase>00400000</DCC_ImageBase>
<DCC_Description>OpenCV VCL component</DCC_Description>
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;Vcl;$(DCC_Namespace)</DCC_Namespace>
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
<DCC_N>false</DCC_N>
<DCC_S>false</DCC_S>
<GenDll>true</GenDll>
<DCC_K>false</DCC_K>
<VerInfo_Locale>1049</VerInfo_Locale>
<DCC_E>false</DCC_E>
<DCC_F>false</DCC_F>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
<DCC_DebugInformation>false</DCC_DebugInformation>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
<DCC_Optimize>false</DCC_Optimize>
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
</PropertyGroup>
<ItemGroup>
<DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="designide.dcp"/>
<DCCReference Include="dclCommonOpenCV230.dcp"/>
<DCCReference Include="..\ocv.comp.RegisterVCL.pas"/>
<DCCReference Include="..\ocv.comp.View.pas"/>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
</BuildConfiguration>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
<BuildConfiguration Include="Release">
<Key>Cfg_1</Key>
<CfgParent>Base</CfgParent>
</BuildConfiguration>
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<Delphi.Personality>
<Source>
<Source Name="MainSource">dclVCLOpenCV230.dpk</Source>
</Source>
<VersionInfo>
<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">1</VersionInfo>
<VersionInfo Name="MinorVer">0</VersionInfo>
<VersionInfo Name="Release">0</VersionInfo>
<VersionInfo Name="Build">0</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
<VersionInfo Name="Special">False</VersionInfo>
<VersionInfo Name="Private">False</VersionInfo>
<VersionInfo Name="DLL">False</VersionInfo>
<VersionInfo Name="Locale">1049</VersionInfo>
<VersionInfo Name="CodePage">1251</VersionInfo>
</VersionInfo>
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"/>
<VersionInfoKeys Name="FileDescription"/>
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"/>
<VersionInfoKeys Name="LegalCopyright"/>
<VersionInfoKeys Name="LegalTrademarks"/>
<VersionInfoKeys Name="OriginalFilename"/>
<VersionInfoKeys Name="ProductName"/>
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
<VersionInfoKeys Name="Comments"/>
</VersionInfoKeys>
</Delphi.Personality>
<Platforms>
<Platform value="Win64">False</Platform>
<Platform value="OSX32">False</Platform>
<Platform value="Win32">True</Platform>
</Platforms>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
</ProjectExtensions>
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
</Project>

Binary file not shown.

Binary file not shown.

View File

@ -413,8 +413,8 @@ const
// Add to search path \Delphi-OpenCV\resource\facedetectxml\ // Add to search path \Delphi-OpenCV\resource\facedetectxml\
/// ///
{$I haarcascade.inc} {$I haarcascade.inc}
{$R haarcascade.rc haarcascade.res} {$R haarcascade.res haarcascade.rc}
{$R haarcascade.res} {.$R haarcascade.res}
implementation implementation

View File

@ -33,7 +33,7 @@ uses
System.Classes, System.Classes,
System.Types, System.Types,
FMX.Types, FMX.Types,
{$IFDEF DELPHIXE6_UP} // Delphi XE6 and above {$IFDEF DELPHIXE2_UP} // Delphi XE6 and above
FMX.Graphics, FMX.Graphics,
{$ELSE} {$ELSE}
FMX.PixelFormats, FMX.PixelFormats,
@ -118,7 +118,7 @@ type
property Visible; property Visible;
{$IF CompilerVersion<21.0} {$IF CompilerVersion<21.0}
property DesignVisible; property DesignVisible;
{$ENDIF} {$IFEND}
property Opacity; property Opacity;
property Margins; property Margins;
property Padding; property Padding;
@ -196,7 +196,7 @@ begin
{$IFDEF DELPHIXE5_UP} {$IFDEF DELPHIXE5_UP}
IPLImageToFMXBitmap(FImage.IpImage, BackBuffer); IPLImageToFMXBitmap(FImage.IpImage, BackBuffer);
{$IFEND} {$ENDIF}
Canvas.DrawBitmap(BackBuffer, RectF(0, 0, BackBuffer.Width, BackBuffer.Height), PaintRect, 1, True); Canvas.DrawBitmap(BackBuffer, RectF(0, 0, BackBuffer.Width, BackBuffer.Height), PaintRect, 1, True);
if Assigned(OnAfterPaint) then if Assigned(OnAfterPaint) then

View File

@ -592,7 +592,7 @@ procedure cvGetRawData(arr: pCvArr; data: pByte; step: pInteger = nil; roi_size:
{ Returns width and height of array in elements { Returns width and height of array in elements
CVAPI(CvSize) cvGetSize( const pCvArr* arr ); CVAPI(CvSize) cvGetSize( const pCvArr* arr );
} }
function cvGetSize(const arr: pCvArr): TCvSize; {$IF DEFINED(DelphiOCVVersion_30)} cdecl; {$ENDIF} function cvGetSize(const arr: pCvArr): TCvSize; {$IFDEF DelphiOCVVersion_30} cdecl; {$ENDIF}
// procedure _cvGetSize(const arr: pCvArr; Var size: TCvSize); cdecl; // procedure _cvGetSize(const arr: pCvArr; Var size: TCvSize); cdecl;
{ Copies source array to destination array */ { Copies source array to destination array */
@ -2548,7 +2548,7 @@ end;
// ------------------- // -------------------
{$ELSEIF DEFINED(DelphiOCVVersion_30)} {$ELSEIF DEFINED(DelphiOCVVersion_30)}
function cvGetSize(const arr: pCvArr): TCvSize; external core_lib; function cvGetSize(const arr: pCvArr): TCvSize; external core_lib;
{$ENDIF} {$IFEND}
// procedure cvCopy; external core_lib; // procedure cvCopy; external core_lib;
procedure cvCopy(const src: pCvArr; dst: pCvArr; const mask: pCvArr = nil); cdecl; external core_lib; overload; procedure cvCopy(const src: pCvArr; dst: pCvArr; const mask: pCvArr = nil); cdecl; external core_lib; overload;
// procedure cvCopy(const src: pIplImage; dst: pIplImage; const mask: pIplImage = nil); cdecl; external core_lib; overload; // procedure cvCopy(const src: pIplImage; dst: pIplImage; const mask: pIplImage = nil); cdecl; external core_lib; overload;

View File

@ -1150,7 +1150,7 @@ var
{$IF DEFINED(SAFELOADLIB) AND DEFINED(DEBUG)} {$IF DEFINED(SAFELOADLIB) AND DEFINED(DEBUG)}
procedure Init_highgui_c_lib; procedure Init_highgui_c_lib;
{$ENDIF} {$IFEND}
implementation implementation

View File

@ -52,7 +52,7 @@ const
CV_VERSION_MAJOR = '0'; CV_VERSION_MAJOR = '0';
CV_VERSION_MINOR = '0'; CV_VERSION_MINOR = '0';
CV_VERSION_REVISION = '0'; CV_VERSION_REVISION = '0';
{$ENDIF} {$IFEND}
CV_VERSION = CV_VERSION_EPOCH + '.' + CV_VERSION_MAJOR + '.' + CV_VERSION_MINOR + '.' + CV_VERSION_REVISION; CV_VERSION = CV_VERSION_EPOCH + '.' + CV_VERSION_MAJOR + '.' + CV_VERSION_MINOR + '.' + CV_VERSION_REVISION;
// * old style version constants*/ // * old style version constants*/
@ -78,7 +78,7 @@ const
'core' + 'core' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}
@ -98,7 +98,7 @@ highgui_lib = {$IFDEF MSWINDOWS}
'highgui' + 'highgui' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}
@ -118,7 +118,7 @@ features2d_lib = {$IFDEF MSWINDOWS}
'features2d' + 'features2d' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}
@ -138,7 +138,7 @@ imgproc_lib = {$IFDEF MSWINDOWS}
'imgproc' + 'imgproc' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}
@ -158,7 +158,7 @@ objdetect_lib = {$IFDEF MSWINDOWS}
'objdetect' + 'objdetect' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}
@ -178,7 +178,7 @@ legacy_lib = {$IFDEF MSWINDOWS}
'legacy' + 'legacy' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}
@ -198,7 +198,7 @@ calib3d_lib = {$IFDEF MSWINDOWS}
'calib3d' + 'calib3d' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}
@ -218,7 +218,7 @@ tracking_lib = {$IFDEF MSWINDOWS}
'video' + 'video' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}
@ -238,7 +238,7 @@ nonfree_lib = {$IFDEF MSWINDOWS}
'nonfree' + 'nonfree' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}
@ -272,7 +272,7 @@ opencv_photo_lib = {$IFDEF MSWINDOWS}
'photo' + 'photo' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}
@ -292,7 +292,7 @@ opencv_contrib_lib = {$IFDEF MSWINDOWS}
'contrib' + 'contrib' +
{$ELSEIF DEFINED( DelphiOCVVersion_30)} {$ELSEIF DEFINED( DelphiOCVVersion_30)}
'world' + 'world' +
{$ENDIF} {$IFEND}
CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll'; CV_VERSION_DLL {$IFDEF DEBUG} + 'd'{$ENDIF} + '.dll';
{$ELSE} {$ELSE}
{$IFDEF MACOS} {$IFDEF MACOS}

View File

@ -59,7 +59,7 @@ Uses
Winapi.Windows Winapi.Windows
{$IF DEFINED(USE_CRITICALSECTION) OR DEFINED(USE_SIMLOCK)} {$IF DEFINED(USE_CRITICALSECTION) OR DEFINED(USE_SIMLOCK)}
, System.SyncObjs , System.SyncObjs
{$ENDIF} {$IFEND}
; ;
Type Type

View File

@ -413,7 +413,7 @@ type
{$IF DEFINED(SAFELOADLIB) AND DEFINED(DEBUG)} {$IF DEFINED(SAFELOADLIB) AND DEFINED(DEBUG)}
procedure Init_opencv_objdetect_lib; procedure Init_opencv_objdetect_lib;
{$ENDIF} {$IFEND}
implementation implementation