Refactoring...

Signed-off-by: Laentir Valetov <laex@bk.ru>
This commit is contained in:
Laentir Valetov 2019-12-18 01:53:23 +04:00
parent 1b0632f752
commit f407adb235
51 changed files with 590 additions and 188 deletions

View File

@ -9,16 +9,17 @@
## Requirements: ## Requirements:
* Visual C++ Redistributable for Visual Studio 2015<br> * Visual C++ Redistributable for Visual Studio 2015<br>
Files: msvcp140.dll, msvcp140d.dll in "Delphi-OpenCV\redist\" or [here][2]<br> Files: msvcp140.dll, msvcp140d.dll in "Delphi-OpenCV\redist\" or [here, but it is not exactly][2]<br>
or from the repository: or from the repository (Delphi-OpenCV\redist\VC14):
``` ```
(1) 32-bit in the "Delphi-OpenCV\redist\VC14\x86\" (1) 32-bit in the "\x86"
(2) 64-bit in the "Delphi-OpenCV\redist\VC14\x64\" (2) 64-bit in the "\x64"
``` ```
* Shared library FFMPEG 4.2.1 for Windows can be downloaded from [here][5]<br> * Shared library FFMPEG 4.2.1 for Windows can be downloaded from [here][5]<br>
or from the repository (Delphi-OpenCV\redist\ffmpeg):
``` ```
(3) FFmpeg 32-bit Shared (3) FFmpeg 32-bit Shared "\x86"
(4) FFmpeg 64-bit Shared (4) FFmpeg 64-bit Shared "\x64"
``` ```
* Dynamic library OpenCV need to download [here][4]<br> * Dynamic library OpenCV need to download [here][4]<br>
Files: *2413.dll and *2413d.dll Files: *2413.dll and *2413d.dll
@ -28,55 +29,60 @@ After installing OpenCV:
(6) 64-bit in the C:\OpenCV\build\x64\vc14\bin\*.dll (6) 64-bit in the C:\OpenCV\build\x64\vc14\bin\*.dll
``` ```
* Some examples (FFMPEG) required [SDL 2.0 and SDL 1.2][3]<br> * Some examples (FFMPEG) required [SDL 2.0 and SDL 1.2][3]<br>
or from the repository (Delphi-OpenCV\redist\SDL\1.2 and \2.0):
``` ```
(7) 32-bit - SDL.dll and SDL2.dll (7) 32-bit - SDL.dll and SDL2.dll "\x86"
(8) 64-bit - SDL.dll and SDL2.dll (8) 64-bit - SDL.dll and SDL2.dll "\x64"
``` ```
# How to install:
#### Copy files ## 1. Dynamic libraries
### 1.1. Copy files
<b>OS Windows 64-bit</b><br> <b>OS Windows 64-bit</b><br>
``` ```
Target platform 64-bit: (2),(4),(6),(8) -> "C:\Windows\System32\" Target platform 64-bit: (2),(4),(6),(8) -> "C:\Windows\System32\"
Target platform 32-bit: (1),(3),(5),(7) -> "C:\Windows\SysWOW64\" Target platform 32-bit: (1),(3),(5),(7) -> "C:\Windows\SysWOW64\"
``` ```
<b>OS Windows 32-bit</b><br> <b>OS Windows 32-bit</b><br>
```
Target platform 32-bit: (1),(3),(5),(7) -> "C:\Windows\System32\" Target platform 32-bit: (1),(3),(5),(7) -> "C:\Windows\System32\"
### 2. Delphi environment setting
Download and unzip the [archive][1] or clone repository<br>
``` ```
git clone https://github.com/Laex/Delphi-OpenCV.git
## How to install: ```
Download the [archive][1].<br> Get the following directory structure<br>
Unzip it to a convenient directory, thus get the following directory structure<br>
``` ```
<PROJECT_ROOT> - Directory, for example, "C:\Delphi\OpenCV\" <PROJECT_ROOT> - Directory, for example, "C:\Delphi\OpenCV\"
<bin> <bin> - here are the executable files of the examples
<redist> <CheckCVDep> - program for checking the environment
<resource> <Delphi-FFMPEG> - empty directory for "Delphi-FFMPEG"
<samples> <packages> - packages for D10-D10.3
<source> <redist> - redistributable packages
<resource> - media for working examples and Haar-cascades
<samples> - examples
<source> - object pascal sources for OpenCV, SDL, OpenGL
<source3> - attempt for opencv 3
<source4> - blank for OpenCV 4
``` ```
Add the search path for the modules of the project in Delphi IDE (Tools-Options-Delphi Options-Library-Library path) Run InitDelphiFFMPEG.cmd to initialize the "Delphi-FFMPEG" submodule. The <Delphi-FFMPEG> directory should be populated with sources for "Delphi-FFMPEG".
If it didnt work, then
```
git clone https://github.com/Laex/Delphi-FFMPEG.git
```
Add the search path for the modules of the project in Delphi IDE<br>
"Tools-Options-Delphi Options-Library-Library path" or "Tools-Options-Language-Delphi-Library"
``` ```
<PROJECT_ROOT>\source <PROJECT_ROOT>\source
<PROJECT_ROOT>\source\classes
<PROJECT_ROOT>\source\component
<PROJECT_ROOT>\source\Delphi-FFMPEG\source
<PROJECT_ROOT>\source\opengl <PROJECT_ROOT>\source\opengl
<PROJECT_ROOT>\source\sdl <PROJECT_ROOT>\source\sdl
<PROJECT_ROOT>\source\sdl2 <PROJECT_ROOT>\source\sdl2
<PROJECT_ROOT>\source\utils <PROJECT_ROOT>\packages
<PROJECT_ROOT>\resource
<PROJECT_ROOT>\resource\facedetectxml <PROJECT_ROOT>\resource\facedetectxml
<PROJECT_ROOT>\source3
<PROJECT_ROOT>\Delphi-FFMPEG\source
``` ```
where ```<PROJECT_ROOT>``` directory, which was unzipped project.<br> where ```<PROJECT_ROOT>``` directory, which was unzipped (or cloned) repository.<br>
### 3. Verify that the environment is configured correctly
To install the components, open and install
```
<PROJECT_ROOT>\source\component\DelphiXX\dclCommonOpenCVXXX.dpk
<PROJECT_ROOT>\source\component\DelphiXX\dclFFMSourceXXX.dpk
<PROJECT_ROOT>\source\component\DelphiXX\dclFMXOpenCVXXX.dpk
<PROJECT_ROOT>\source\component\DelphiXX\dclVCLOpenCVXXX.dpk
```
## Verify that the environment is configured correctly
Run from the repository Run from the repository
``` ```
Delphi-OpenCV/CheckCVDep/CheckCVDep.exe Delphi-OpenCV/CheckCVDep/CheckCVDep.exe
@ -95,6 +101,16 @@ OK
OK OK
``` ```
To successfully install components and run most of the examples, the availability of FFMPEG DLL, Microsoft DLL and OpenCV DLL is sufficient To successfully install components and run most of the examples, the availability of FFMPEG DLL, Microsoft DLL and OpenCV DLL is sufficient
### 4. Install the components
To install the components, open and install
```
<PROJECT_ROOT>\packages\Delphi XXX\rtpFFMPEG.dpk
<PROJECT_ROOT>\packages\Delphi XXX\rclVCLOpenCV.dpk
<PROJECT_ROOT>\packages\Delphi XXX\rclFMXOpenCV.dpk
<PROJECT_ROOT>\packages\Delphi XXX\dclVCLOpenCV.dpk
<PROJECT_ROOT>\packages\Delphi XXX\dclFMXOpenCV.dpk
```
## Examples ## Examples
Open in Delphi IDE and compile:<br> Open in Delphi IDE and compile:<br>
Examples of the use of certain functions and procedures Examples of the use of certain functions and procedures
@ -111,7 +127,7 @@ Examples of the use of video processing algorithms using VCL.Forms
``` ```
Examples of using FFMPEG library header files are in the Examples of using FFMPEG library header files are in the
``` ```
<PROJECT_ROOT>\source\ffmpeg\examples <PROJECT_ROOT>\Delphi-FFMPEG\examples
``` ```
Examples of use of components Examples of use of components
``` ```
@ -129,4 +145,4 @@ Examples of use of components
[2]: https://www.microsoft.com/en-us/download/details.aspx?id=48145 [2]: https://www.microsoft.com/en-us/download/details.aspx?id=48145
[3]: https://www.libsdl.org/index.php [3]: https://www.libsdl.org/index.php
[4]: https://github.com/opencv/opencv/releases/tag/2.4.13.6 [4]: https://github.com/opencv/opencv/releases/tag/2.4.13.6
[5]: http://ffmpeg.zeranoe.com/builds/ [5]: http://ffmpeg.zeranoe.com/builds/

View File

@ -145,16 +145,7 @@
<Overwrite>true</Overwrite> <Overwrite>true</Overwrite>
</Platform> </Platform>
</DeployFile> </DeployFile>
<DeployClass Name="DependencyModule"> <DeployClass Name="ProjectiOSDeviceResourceRules"/>
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXResource"> <DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32"> <Platform Name="OSX32">
<RemoteDir>Contents\Resources</RemoteDir> <RemoteDir>Contents\Resources</RemoteDir>
@ -468,7 +459,16 @@
<Operation>1</Operation> <Operation>1</Operation>
</Platform> </Platform>
</DeployClass> </DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules"/> <DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>

View File

@ -60,7 +60,7 @@
<BT_BuildType>Debug</BT_BuildType> <BT_BuildType>Debug</BT_BuildType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''"> <PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <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_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> <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@ -131,16 +131,7 @@
<Overwrite>true</Overwrite> <Overwrite>true</Overwrite>
</Platform> </Platform>
</DeployFile> </DeployFile>
<DeployClass Name="DependencyModule"> <DeployClass Name="ProjectiOSDeviceResourceRules"/>
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXResource"> <DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32"> <Platform Name="OSX32">
<RemoteDir>Contents\Resources</RemoteDir> <RemoteDir>Contents\Resources</RemoteDir>
@ -454,7 +445,16 @@
<Operation>1</Operation> <Operation>1</Operation>
</Platform> </Platform>
</DeployClass> </DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules"/> <DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>

View File

@ -36,6 +36,6 @@ requires
contains contains
ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas', ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas',
ocv.fmxutils in '..\..\ocv.fmxutils.pas'; ocv.fmxutils in '..\..\source\ocv.fmxutils.pas';
end. end.

View File

@ -33,6 +33,12 @@
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
<Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''"> <PropertyGroup Condition="'$(Base)'!=''">
<VerInfo_Locale>1049</VerInfo_Locale> <VerInfo_Locale>1049</VerInfo_Locale>
<DCC_F>false</DCC_F> <DCC_F>false</DCC_F>
@ -71,6 +77,9 @@
<DCC_Optimize>false</DCC_Optimize> <DCC_Optimize>false</DCC_Optimize>
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<DelphiCompile Include="$(MainSource)"> <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
@ -79,7 +88,7 @@
<DCCReference Include="fmx.dcp"/> <DCCReference Include="fmx.dcp"/>
<DCCReference Include="rclVCLOpenCV.dcp"/> <DCCReference Include="rclVCLOpenCV.dcp"/>
<DCCReference Include="..\ocv.comp.ViewFMX.pas"/> <DCCReference Include="..\ocv.comp.ViewFMX.pas"/>
<DCCReference Include="..\..\ocv.fmxutils.pas"/> <DCCReference Include="..\..\source\ocv.fmxutils.pas"/>
<BuildConfiguration Include="Debug"> <BuildConfiguration Include="Debug">
<Key>Cfg_2</Key> <Key>Cfg_2</Key>
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
@ -110,9 +119,364 @@
<Platform value="Win32">True</Platform> <Platform value="Win32">True</Platform>
<Platform value="Win64">False</Platform> <Platform value="Win64">False</Platform>
</Platforms> </Platforms>
<Deployment Version="2">
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
<Platform Name="OSX32">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
<Platform Name="iOSSimulator">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
<Platform Name="iOSSimulator">
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\17.0\Bpl\rclFMXOpenCV.bpl" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>rclFMXOpenCV.bpl</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32">
<RemoteDir>Contents\Resources</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidClassesDexFile">
<Platform Name="Android">
<RemoteDir>classes</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AdditionalDebugSymbols">
<Platform Name="Win32">
<RemoteDir>Contents\MacOS</RemoteDir>
<Operation>0</Operation>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon144">
<Platform Name="Android">
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidLibnativeMipsFile">
<Platform Name="Android">
<RemoteDir>library\lib\mips</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Required="true" Name="ProjectOutput">
<Platform Name="Win32">
<Operation>0</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
<Platform Name="Android">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="DependencyFramework">
<Platform Name="Win32">
<Operation>0</Operation>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.framework</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="iPhone_Launch640">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPad_Launch1024">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceDebug">
<Platform Name="iOSDevice64">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidLibnativeX86File">
<Platform Name="Android">
<RemoteDir>library\lib\x86</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSInfoPList"/>
<DeployClass Name="AndroidLibnativeArmeabiFile">
<Platform Name="Android">
<RemoteDir>library\lib\armeabi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="DebugSymbols">
<Platform Name="Win32">
<Operation>0</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage470">
<Platform Name="Android">
<RemoteDir>res\drawable-normal</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon96">
<Platform Name="Android">
<RemoteDir>res\drawable-xhdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage640">
<Platform Name="Android">
<RemoteDir>res\drawable-large</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPhone_Launch640x1136">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSEntitlements"/>
<DeployClass Name="Android_LauncherIcon72">
<Platform Name="Android">
<RemoteDir>res\drawable-hdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidGDBServer">
<Platform Name="Android">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXInfoPList"/>
<DeployClass Name="ProjectOSXEntitlements"/>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidSplashStyles">
<Platform Name="Android">
<RemoteDir>res\values</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage426">
<Platform Name="Android">
<RemoteDir>res\drawable-small</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidSplashImageDef">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSResource">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectAndroidManifest">
<Platform Name="Android">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
<RemoteDir>res\drawable</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="File">
<Platform Name="Win32">
<Operation>0</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>0</Operation>
</Platform>
<Platform Name="OSX32">
<Operation>0</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>0</Operation>
</Platform>
<Platform Name="Android">
<Operation>0</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>0</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidServiceOutput">
<Platform Name="Android">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Required="true" Name="DependencyPackage">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.bpl</Extensions>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon48">
<Platform Name="Android">
<RemoteDir>res\drawable-mdpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage960">
<Platform Name="Android">
<RemoteDir>res\drawable-xlarge</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon36">
<Platform Name="Android">
<RemoteDir>res\drawable-ldpi</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
</Deployment>
</BorlandProject> </BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion> <ProjectFileVersion>12</ProjectFileVersion>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/> <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
<Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/> <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
<Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
</Project> </Project>

View File

@ -35,29 +35,29 @@ requires
rtpFFMPEG; rtpFFMPEG;
contains contains
ocv.calib3d_c in '..\..\ocv.calib3d_c.pas', ocv.calib3d_c in '..\..\source\ocv.calib3d_c.pas',
ocv.compat in '..\..\ocv.compat.pas', ocv.compat in '..\..\source\ocv.compat.pas',
ocv.core.types_c in '..\..\ocv.core.types_c.pas', ocv.core.types_c in '..\..\source\ocv.core.types_c.pas',
ocv.core_c in '..\..\ocv.core_c.pas', ocv.core_c in '..\..\source\ocv.core_c.pas',
ocv.editor in '..\..\ocv.editor.pas', ocv.editor in '..\..\source\ocv.editor.pas',
ocv.haar in '..\..\ocv.haar.pas', ocv.haar in '..\..\source\ocv.haar.pas',
ocv.highgui_c in '..\..\ocv.highgui_c.pas', ocv.highgui_c in '..\..\source\ocv.highgui_c.pas',
ocv.imgproc.types_c in '..\..\ocv.imgproc.types_c.pas', ocv.imgproc.types_c in '..\..\source\ocv.imgproc.types_c.pas',
ocv.imgproc_c in '..\..\ocv.imgproc_c.pas', ocv.imgproc_c in '..\..\source\ocv.imgproc_c.pas',
ocv.legacy in '..\..\ocv.legacy.pas', ocv.legacy in '..\..\source\ocv.legacy.pas',
ocv.lib in '..\..\ocv.lib.pas', ocv.lib in '..\..\source\ocv.lib.pas',
ocv.lock in '..\..\ocv.lock.pas', ocv.lock in '..\..\source\ocv.lock.pas',
ocv.nonfree in '..\..\ocv.nonfree.pas', ocv.nonfree in '..\..\source\ocv.nonfree.pas',
ocv.objdetect_c in '..\..\ocv.objdetect_c.pas', ocv.objdetect_c in '..\..\source\ocv.objdetect_c.pas',
ocv.photo_c in '..\..\ocv.photo_c.pas', ocv.photo_c in '..\..\source\ocv.photo_c.pas',
ocv.tracking_c in '..\..\ocv.tracking_c.pas', ocv.tracking_c in '..\..\source\ocv.tracking_c.pas',
ocv.utils in '..\..\ocv.utils.pas', ocv.utils in '..\..\source\ocv.utils.pas',
ocv.comp.FFMSource in '..\ocv.comp.FFMSource.pas',
ocv.comp.ImageOperation in '..\ocv.comp.ImageOperation.pas', ocv.comp.ImageOperation in '..\ocv.comp.ImageOperation.pas',
ocv.comp.proc in '..\ocv.comp.proc.pas', ocv.comp.proc in '..\ocv.comp.proc.pas',
ocv.comp.Source in '..\ocv.comp.Source.pas', ocv.comp.Source in '..\ocv.comp.Source.pas',
ocv.comp.Types in '..\ocv.comp.Types.pas', ocv.comp.Types in '..\ocv.comp.Types.pas',
ocv.comp.VideoWriter in '..\ocv.comp.VideoWriter.pas', ocv.comp.VideoWriter in '..\ocv.comp.VideoWriter.pas',
ocv.comp.View in '..\ocv.comp.View.pas', ocv.comp.View in '..\ocv.comp.View.pas';
ocv.comp.FFMSource in '..\ocv.comp.FFMSource.pas';
end. end.

View File

@ -61,7 +61,7 @@
<BT_BuildType>Debug</BT_BuildType> <BT_BuildType>Debug</BT_BuildType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''"> <PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <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_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> <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@ -87,31 +87,31 @@
<DCCReference Include="rtl.dcp"/> <DCCReference Include="rtl.dcp"/>
<DCCReference Include="vcl.dcp"/> <DCCReference Include="vcl.dcp"/>
<DCCReference Include="rtpFFMPEG.dcp"/> <DCCReference Include="rtpFFMPEG.dcp"/>
<DCCReference Include="..\..\ocv.calib3d_c.pas"/> <DCCReference Include="..\..\source\ocv.calib3d_c.pas"/>
<DCCReference Include="..\..\ocv.compat.pas"/> <DCCReference Include="..\..\source\ocv.compat.pas"/>
<DCCReference Include="..\..\ocv.core.types_c.pas"/> <DCCReference Include="..\..\source\ocv.core.types_c.pas"/>
<DCCReference Include="..\..\ocv.core_c.pas"/> <DCCReference Include="..\..\source\ocv.core_c.pas"/>
<DCCReference Include="..\..\ocv.editor.pas"/> <DCCReference Include="..\..\source\ocv.editor.pas"/>
<DCCReference Include="..\..\ocv.haar.pas"/> <DCCReference Include="..\..\source\ocv.haar.pas"/>
<DCCReference Include="..\..\ocv.highgui_c.pas"/> <DCCReference Include="..\..\source\ocv.highgui_c.pas"/>
<DCCReference Include="..\..\ocv.imgproc.types_c.pas"/> <DCCReference Include="..\..\source\ocv.imgproc.types_c.pas"/>
<DCCReference Include="..\..\ocv.imgproc_c.pas"/> <DCCReference Include="..\..\source\ocv.imgproc_c.pas"/>
<DCCReference Include="..\..\ocv.legacy.pas"/> <DCCReference Include="..\..\source\ocv.legacy.pas"/>
<DCCReference Include="..\..\ocv.lib.pas"/> <DCCReference Include="..\..\source\ocv.lib.pas"/>
<DCCReference Include="..\..\ocv.lock.pas"/> <DCCReference Include="..\..\source\ocv.lock.pas"/>
<DCCReference Include="..\..\ocv.nonfree.pas"/> <DCCReference Include="..\..\source\ocv.nonfree.pas"/>
<DCCReference Include="..\..\ocv.objdetect_c.pas"/> <DCCReference Include="..\..\source\ocv.objdetect_c.pas"/>
<DCCReference Include="..\..\ocv.photo_c.pas"/> <DCCReference Include="..\..\source\ocv.photo_c.pas"/>
<DCCReference Include="..\..\ocv.tracking_c.pas"/> <DCCReference Include="..\..\source\ocv.tracking_c.pas"/>
<DCCReference Include="..\..\ocv.utils.pas"/> <DCCReference Include="..\..\source\ocv.utils.pas"/>
<DCCReference Include="..\ocv.comp.FFMSource.pas"/>
<DCCReference Include="..\ocv.comp.ImageOperation.pas"/> <DCCReference Include="..\ocv.comp.ImageOperation.pas"/>
<DCCReference Include="..\ocv.comp.proc.pas"/> <DCCReference Include="..\ocv.comp.proc.pas"/>
<DCCReference Include="..\ocv.comp.Source.pas"/> <DCCReference Include="..\ocv.comp.Source.pas"/>
<DCCReference Include="..\ocv.comp.Types.pas"/> <DCCReference Include="..\ocv.comp.Types.pas"/>
<DCCReference Include="..\ocv.comp.VideoWriter.pas"/> <DCCReference Include="..\ocv.comp.VideoWriter.pas"/>
<DCCReference Include="..\ocv.comp.View.pas"/> <DCCReference Include="..\ocv.comp.View.pas"/>
<DCCReference Include="..\ocv.comp.FFMSource.pas"/> <RcCompile Include="..\..\resource\facedetectxml\haarcascade.rc">
<RcCompile Include="..\..\..\resource\facedetectxml\haarcascade.rc">
<Form>haarcascade.res</Form> <Form>haarcascade.res</Form>
</RcCompile> </RcCompile>
<BuildConfiguration Include="Debug"> <BuildConfiguration Include="Debug">
@ -150,16 +150,7 @@
<Overwrite>true</Overwrite> <Overwrite>true</Overwrite>
</Platform> </Platform>
</DeployFile> </DeployFile>
<DeployClass Name="DependencyModule"> <DeployClass Name="ProjectiOSDeviceResourceRules"/>
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXResource"> <DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32"> <Platform Name="OSX32">
<RemoteDir>Contents\Resources</RemoteDir> <RemoteDir>Contents\Resources</RemoteDir>
@ -473,7 +464,16 @@
<Operation>1</Operation> <Operation>1</Operation>
</Platform> </Platform>
</DeployClass> </DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules"/> <DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>

View File

@ -33,6 +33,12 @@
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
<Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''"> <PropertyGroup Condition="'$(Base)'!=''">
<VerInfo_Locale>1049</VerInfo_Locale> <VerInfo_Locale>1049</VerInfo_Locale>
<DCC_F>false</DCC_F> <DCC_F>false</DCC_F>
@ -71,6 +77,9 @@
<DCC_Optimize>false</DCC_Optimize> <DCC_Optimize>false</DCC_Optimize>
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<DelphiCompile Include="$(MainSource)"> <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>

View File

@ -36,6 +36,6 @@ requires
contains contains
ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas', ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas',
ocv.fmxutils in '..\..\ocv.fmxutils.pas'; ocv.fmxutils in '..\..\source\ocv.fmxutils.pas';
end. end.

View File

@ -33,6 +33,12 @@
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
<Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''"> <PropertyGroup Condition="'$(Base)'!=''">
<DCC_Description>OpenCV FMX runtime library</DCC_Description> <DCC_Description>OpenCV FMX runtime library</DCC_Description>
<VerInfo_Locale>1049</VerInfo_Locale> <VerInfo_Locale>1049</VerInfo_Locale>
@ -72,6 +78,9 @@
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
<DCC_Optimize>false</DCC_Optimize> <DCC_Optimize>false</DCC_Optimize>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<DelphiCompile Include="$(MainSource)"> <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>

View File

@ -35,29 +35,29 @@ requires
rtpFFMPEG; rtpFFMPEG;
contains contains
ocv.calib3d_c in '..\..\ocv.calib3d_c.pas', ocv.calib3d_c in '..\..\source\ocv.calib3d_c.pas',
ocv.compat in '..\..\ocv.compat.pas', ocv.compat in '..\..\source\ocv.compat.pas',
ocv.core.types_c in '..\..\ocv.core.types_c.pas', ocv.core.types_c in '..\..\source\ocv.core.types_c.pas',
ocv.core_c in '..\..\ocv.core_c.pas', ocv.core_c in '..\..\source\ocv.core_c.pas',
ocv.editor in '..\..\ocv.editor.pas', ocv.editor in '..\..\source\ocv.editor.pas',
ocv.haar in '..\..\ocv.haar.pas', ocv.haar in '..\..\source\ocv.haar.pas',
ocv.highgui_c in '..\..\ocv.highgui_c.pas', ocv.highgui_c in '..\..\source\ocv.highgui_c.pas',
ocv.imgproc.types_c in '..\..\ocv.imgproc.types_c.pas', ocv.imgproc.types_c in '..\..\source\ocv.imgproc.types_c.pas',
ocv.imgproc_c in '..\..\ocv.imgproc_c.pas', ocv.imgproc_c in '..\..\source\ocv.imgproc_c.pas',
ocv.legacy in '..\..\ocv.legacy.pas', ocv.legacy in '..\..\source\ocv.legacy.pas',
ocv.lib in '..\..\ocv.lib.pas', ocv.lib in '..\..\source\ocv.lib.pas',
ocv.lock in '..\..\ocv.lock.pas', ocv.lock in '..\..\source\ocv.lock.pas',
ocv.nonfree in '..\..\ocv.nonfree.pas', ocv.nonfree in '..\..\source\ocv.nonfree.pas',
ocv.objdetect_c in '..\..\ocv.objdetect_c.pas', ocv.objdetect_c in '..\..\source\ocv.objdetect_c.pas',
ocv.photo_c in '..\..\ocv.photo_c.pas', ocv.photo_c in '..\..\source\ocv.photo_c.pas',
ocv.tracking_c in '..\..\ocv.tracking_c.pas', ocv.tracking_c in '..\..\source\ocv.tracking_c.pas',
ocv.utils in '..\..\ocv.utils.pas', ocv.utils in '..\..\source\ocv.utils.pas',
ocv.comp.FFMSource in '..\ocv.comp.FFMSource.pas',
ocv.comp.ImageOperation in '..\ocv.comp.ImageOperation.pas', ocv.comp.ImageOperation in '..\ocv.comp.ImageOperation.pas',
ocv.comp.proc in '..\ocv.comp.proc.pas', ocv.comp.proc in '..\ocv.comp.proc.pas',
ocv.comp.Source in '..\ocv.comp.Source.pas', ocv.comp.Source in '..\ocv.comp.Source.pas',
ocv.comp.Types in '..\ocv.comp.Types.pas', ocv.comp.Types in '..\ocv.comp.Types.pas',
ocv.comp.VideoWriter in '..\ocv.comp.VideoWriter.pas', ocv.comp.VideoWriter in '..\ocv.comp.VideoWriter.pas',
ocv.comp.View in '..\ocv.comp.View.pas', ocv.comp.View in '..\ocv.comp.View.pas';
ocv.comp.FFMSource in '..\ocv.comp.FFMSource.pas';
end. end.

View File

@ -65,7 +65,7 @@
<VerInfo_Locale>1033</VerInfo_Locale> <VerInfo_Locale>1033</VerInfo_Locale>
<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.$(ModuleName)</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.$(ModuleName)</VerInfo_Keys>
<BT_BuildType>Debug</BT_BuildType> <BT_BuildType>Debug</BT_BuildType>
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''"> <PropertyGroup Condition="'$(Cfg_1)'!=''">
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define> <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
@ -88,33 +88,30 @@
<DCCReference Include="rtl.dcp"/> <DCCReference Include="rtl.dcp"/>
<DCCReference Include="vcl.dcp"/> <DCCReference Include="vcl.dcp"/>
<DCCReference Include="rtpFFMPEG.dcp"/> <DCCReference Include="rtpFFMPEG.dcp"/>
<DCCReference Include="..\..\ocv.calib3d_c.pas"/> <DCCReference Include="..\..\source\ocv.calib3d_c.pas"/>
<DCCReference Include="..\..\ocv.compat.pas"/> <DCCReference Include="..\..\source\ocv.compat.pas"/>
<DCCReference Include="..\..\ocv.core.types_c.pas"/> <DCCReference Include="..\..\source\ocv.core.types_c.pas"/>
<DCCReference Include="..\..\ocv.core_c.pas"/> <DCCReference Include="..\..\source\ocv.core_c.pas"/>
<DCCReference Include="..\..\ocv.editor.pas"/> <DCCReference Include="..\..\source\ocv.editor.pas"/>
<DCCReference Include="..\..\ocv.haar.pas"/> <DCCReference Include="..\..\source\ocv.haar.pas"/>
<DCCReference Include="..\..\ocv.highgui_c.pas"/> <DCCReference Include="..\..\source\ocv.highgui_c.pas"/>
<DCCReference Include="..\..\ocv.imgproc.types_c.pas"/> <DCCReference Include="..\..\source\ocv.imgproc.types_c.pas"/>
<DCCReference Include="..\..\ocv.imgproc_c.pas"/> <DCCReference Include="..\..\source\ocv.imgproc_c.pas"/>
<DCCReference Include="..\..\ocv.legacy.pas"/> <DCCReference Include="..\..\source\ocv.legacy.pas"/>
<DCCReference Include="..\..\ocv.lib.pas"/> <DCCReference Include="..\..\source\ocv.lib.pas"/>
<DCCReference Include="..\..\ocv.lock.pas"/> <DCCReference Include="..\..\source\ocv.lock.pas"/>
<DCCReference Include="..\..\ocv.nonfree.pas"/> <DCCReference Include="..\..\source\ocv.nonfree.pas"/>
<DCCReference Include="..\..\ocv.objdetect_c.pas"/> <DCCReference Include="..\..\source\ocv.objdetect_c.pas"/>
<DCCReference Include="..\..\ocv.photo_c.pas"/> <DCCReference Include="..\..\source\ocv.photo_c.pas"/>
<DCCReference Include="..\..\ocv.tracking_c.pas"/> <DCCReference Include="..\..\source\ocv.tracking_c.pas"/>
<DCCReference Include="..\..\ocv.utils.pas"/> <DCCReference Include="..\..\source\ocv.utils.pas"/>
<DCCReference Include="..\ocv.comp.FFMSource.pas"/>
<DCCReference Include="..\ocv.comp.ImageOperation.pas"/> <DCCReference Include="..\ocv.comp.ImageOperation.pas"/>
<DCCReference Include="..\ocv.comp.proc.pas"/> <DCCReference Include="..\ocv.comp.proc.pas"/>
<DCCReference Include="..\ocv.comp.Source.pas"/> <DCCReference Include="..\ocv.comp.Source.pas"/>
<DCCReference Include="..\ocv.comp.Types.pas"/> <DCCReference Include="..\ocv.comp.Types.pas"/>
<DCCReference Include="..\ocv.comp.VideoWriter.pas"/> <DCCReference Include="..\ocv.comp.VideoWriter.pas"/>
<DCCReference Include="..\ocv.comp.View.pas"/> <DCCReference Include="..\ocv.comp.View.pas"/>
<DCCReference Include="..\ocv.comp.FFMSource.pas"/>
<RcCompile Include="..\..\..\resource\facedetectxml\haarcascade.rc">
<Form>haarcascade.res</Form>
</RcCompile>
<BuildConfiguration Include="Debug"> <BuildConfiguration Include="Debug">
<Key>Cfg_2</Key> <Key>Cfg_2</Key>
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>

View File

@ -33,6 +33,12 @@
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
<Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''"> <PropertyGroup Condition="'$(Base)'!=''">
<DCC_Description>FFMPEG runtime library</DCC_Description> <DCC_Description>FFMPEG runtime library</DCC_Description>
<VerInfo_Locale>1049</VerInfo_Locale> <VerInfo_Locale>1049</VerInfo_Locale>
@ -72,6 +78,9 @@
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
<DCC_Optimize>false</DCC_Optimize> <DCC_Optimize>false</DCC_Optimize>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<DelphiCompile Include="$(MainSource)"> <DelphiCompile Include="$(MainSource)">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>

View File

@ -36,6 +36,6 @@ requires
contains contains
ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas', ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas',
ocv.fmxutils in '..\..\ocv.fmxutils.pas'; ocv.fmxutils in '..\..\source\ocv.fmxutils.pas';
end. end.

View File

@ -61,7 +61,7 @@
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services-ads-7.0.0.dex.jar;google-play-services-analytics-7.0.0.dex.jar;google-play-services-base-7.0.0.dex.jar;google-play-services-identity-7.0.0.dex.jar;google-play-services-maps-7.0.0.dex.jar;google-play-services-panorama-7.0.0.dex.jar;google-play-services-plus-7.0.0.dex.jar;google-play-services-wallet-7.0.0.dex.jar</EnabledSysJars> <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services-ads-7.0.0.dex.jar;google-play-services-analytics-7.0.0.dex.jar;google-play-services-base-7.0.0.dex.jar;google-play-services-identity-7.0.0.dex.jar;google-play-services-maps-7.0.0.dex.jar;google-play-services-panorama-7.0.0.dex.jar;google-play-services-plus-7.0.0.dex.jar;google-play-services-wallet-7.0.0.dex.jar</EnabledSysJars>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''"> <PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<BT_BuildType>Debug</BT_BuildType> <BT_BuildType>Debug</BT_BuildType>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<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>
@ -112,7 +112,7 @@
<DCCReference Include="..\ocv.comp.VideoWriter.pas"/> <DCCReference Include="..\ocv.comp.VideoWriter.pas"/>
<DCCReference Include="..\ocv.comp.View.pas"/> <DCCReference Include="..\ocv.comp.View.pas"/>
<DCCReference Include="..\ocv.comp.FFMSource.pas"/> <DCCReference Include="..\ocv.comp.FFMSource.pas"/>
<RcCompile Include="..\..\..\resource\facedetectxml\haarcascade.rc"> <RcCompile Include="..\..\resource\facedetectxml\haarcascade.rc">
<Form>haarcascade.res</Form> <Form>haarcascade.res</Form>
</RcCompile> </RcCompile>
<BuildConfiguration Include="Debug"> <BuildConfiguration Include="Debug">

View File

@ -26,8 +26,8 @@ package dclFMXOpenCV;
{$IMAGEBASE $400000} {$IMAGEBASE $400000}
{$DEFINE DEBUG} {$DEFINE DEBUG}
{$ENDIF IMPLICITBUILDING} {$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV FMX designtime component'}
{$IMPLICITBUILD ON} {$IMPLICITBUILD ON}
{$DESCRIPTION 'OpenCV FMX designtime component'}
requires requires
designide, designide,

View File

@ -26,8 +26,8 @@ package dclVCLOpenCV;
{$IMAGEBASE $400000} {$IMAGEBASE $400000}
{$DEFINE DEBUG} {$DEFINE DEBUG}
{$ENDIF IMPLICITBUILDING} {$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV VCL designtime component'}
{$IMPLICITBUILD ON} {$IMPLICITBUILD ON}
{$DESCRIPTION 'OpenCV VCL designtime component'}
requires requires
designide, designide,

View File

@ -25,7 +25,6 @@ package rclFMXOpenCV;
{$IMAGEBASE $400000} {$IMAGEBASE $400000}
{$DEFINE DEBUG} {$DEFINE DEBUG}
{$ENDIF IMPLICITBUILDING} {$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV FMX runtime library'}
{$RUNONLY} {$RUNONLY}
{$IMPLICITBUILD ON} {$IMPLICITBUILD ON}
@ -36,6 +35,6 @@ requires
contains contains
ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas', ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas',
ocv.fmxutils in '..\..\ocv.fmxutils.pas'; ocv.fmxutils in '..\..\source\ocv.fmxutils.pas';
end. end.

View File

@ -25,7 +25,6 @@ package rclVCLOpenCV;
{$IMAGEBASE $400000} {$IMAGEBASE $400000}
{$DEFINE DEBUG} {$DEFINE DEBUG}
{$ENDIF IMPLICITBUILDING} {$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'OpenCV VCL runtime library'}
{$RUNONLY} {$RUNONLY}
{$IMPLICITBUILD ON} {$IMPLICITBUILD ON}
@ -35,23 +34,23 @@ requires
rtpFFMPEG; rtpFFMPEG;
contains contains
ocv.calib3d_c in '..\..\ocv.calib3d_c.pas', ocv.calib3d_c in '..\ocv.calib3d_c.pas',
ocv.compat in '..\..\ocv.compat.pas', ocv.compat in '..\ocv.compat.pas',
ocv.core.types_c in '..\..\ocv.core.types_c.pas', ocv.core.types_c in '..\ocv.core.types_c.pas',
ocv.core_c in '..\..\ocv.core_c.pas', ocv.core_c in '..\ocv.core_c.pas',
ocv.editor in '..\..\ocv.editor.pas', ocv.editor in '..\ocv.editor.pas',
ocv.haar in '..\..\ocv.haar.pas', ocv.haar in '..\ocv.haar.pas',
ocv.highgui_c in '..\..\ocv.highgui_c.pas', ocv.highgui_c in '..\ocv.highgui_c.pas',
ocv.imgproc.types_c in '..\..\ocv.imgproc.types_c.pas', ocv.imgproc.types_c in '..\ocv.imgproc.types_c.pas',
ocv.imgproc_c in '..\..\ocv.imgproc_c.pas', ocv.imgproc_c in '..\ocv.imgproc_c.pas',
ocv.legacy in '..\..\ocv.legacy.pas', ocv.legacy in '..\ocv.legacy.pas',
ocv.lib in '..\..\ocv.lib.pas', ocv.lib in '..\ocv.lib.pas',
ocv.lock in '..\..\ocv.lock.pas', ocv.lock in '..\ocv.lock.pas',
ocv.nonfree in '..\..\ocv.nonfree.pas', ocv.nonfree in '..\ocv.nonfree.pas',
ocv.objdetect_c in '..\..\ocv.objdetect_c.pas', ocv.objdetect_c in '..\ocv.objdetect_c.pas',
ocv.photo_c in '..\..\ocv.photo_c.pas', ocv.photo_c in '..\ocv.photo_c.pas',
ocv.tracking_c in '..\..\ocv.tracking_c.pas', ocv.tracking_c in '..\ocv.tracking_c.pas',
ocv.utils in '..\..\ocv.utils.pas', ocv.utils in '..\ocv.utils.pas',
ocv.comp.ImageOperation in '..\ocv.comp.ImageOperation.pas', ocv.comp.ImageOperation in '..\ocv.comp.ImageOperation.pas',
ocv.comp.proc in '..\ocv.comp.proc.pas', ocv.comp.proc in '..\ocv.comp.proc.pas',
ocv.comp.Source in '..\ocv.comp.Source.pas', ocv.comp.Source in '..\ocv.comp.Source.pas',

View File

@ -33,14 +33,14 @@ requires
rtl; rtl;
contains contains
ffmpeg_types in '..\..\Delphi-FFMPEG\source\ffmpeg_types.pas', ffmpeg_types in '..\Delphi-FFMPEG\source\ffmpeg_types.pas',
libavcodec in '..\..\Delphi-FFMPEG\source\libavcodec.pas', libavcodec in '..\Delphi-FFMPEG\source\libavcodec.pas',
libavdevice in '..\..\Delphi-FFMPEG\source\libavdevice.pas', libavdevice in '..\Delphi-FFMPEG\source\libavdevice.pas',
libavfilter in '..\..\Delphi-FFMPEG\source\libavfilter.pas', libavfilter in '..\Delphi-FFMPEG\source\libavfilter.pas',
libavformat in '..\..\Delphi-FFMPEG\source\libavformat.pas', libavformat in '..\Delphi-FFMPEG\source\libavformat.pas',
libavutil in '..\..\Delphi-FFMPEG\source\libavutil.pas', libavutil in '..\Delphi-FFMPEG\source\libavutil.pas',
libpostproc in '..\..\Delphi-FFMPEG\source\libpostproc.pas', libpostproc in '..\Delphi-FFMPEG\source\libpostproc.pas',
libswresample in '..\..\Delphi-FFMPEG\source\libswresample.pas', libswresample in '..\Delphi-FFMPEG\source\libswresample.pas',
libswscale in '..\..\Delphi-FFMPEG\source\libswscale.pas'; libswscale in '..\Delphi-FFMPEG\source\libswscale.pas';
end. end.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.