diff --git a/README.md b/README.md index e5e4244..68b566c 100644 --- a/README.md +++ b/README.md @@ -9,16 +9,17 @@ ## Requirements: * Visual C++ Redistributable for Visual Studio 2015
-Files: msvcp140.dll, msvcp140d.dll in "Delphi-OpenCV\redist\" or [here][2]
-or from the repository: +Files: msvcp140.dll, msvcp140d.dll in "Delphi-OpenCV\redist\" or [here, but it is not exactly][2]
+or from the repository (Delphi-OpenCV\redist\VC14): ``` -(1) 32-bit in the "Delphi-OpenCV\redist\VC14\x86\" -(2) 64-bit in the "Delphi-OpenCV\redist\VC14\x64\" +(1) 32-bit in the "\x86" +(2) 64-bit in the "\x64" ``` * Shared library FFMPEG 4.2.1 for Windows can be downloaded from [here][5]
+or from the repository (Delphi-OpenCV\redist\ffmpeg): ``` -(3) FFmpeg 32-bit Shared -(4) FFmpeg 64-bit Shared +(3) FFmpeg 32-bit Shared "\x86" +(4) FFmpeg 64-bit Shared "\x64" ``` * Dynamic library OpenCV need to download [here][4]
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 ``` * Some examples (FFMPEG) required [SDL 2.0 and SDL 1.2][3]
+or from the repository (Delphi-OpenCV\redist\SDL\1.2 and \2.0): ``` -(7) 32-bit - SDL.dll and SDL2.dll -(8) 64-bit - SDL.dll and SDL2.dll +(7) 32-bit - SDL.dll and SDL2.dll "\x86" +(8) 64-bit - SDL.dll and SDL2.dll "\x64" ``` - -#### Copy files +# How to install: +## 1. Dynamic libraries +### 1.1. Copy files OS Windows 64-bit
``` Target platform 64-bit: (2),(4),(6),(8) -> "C:\Windows\System32\" Target platform 32-bit: (1),(3),(5),(7) -> "C:\Windows\SysWOW64\" ``` OS Windows 32-bit
-``` Target platform 32-bit: (1),(3),(5),(7) -> "C:\Windows\System32\" +### 2. Delphi environment setting +Download and unzip the [archive][1] or clone repository
``` - -## How to install: -Download the [archive][1].
-Unzip it to a convenient directory, thus get the following directory structure
+git clone https://github.com/Laex/Delphi-OpenCV.git +``` +Get the following directory structure
``` - Directory, for example, "C:\Delphi\OpenCV\" - - - - - + - here are the executable files of the examples + - program for checking the environment + - empty directory for "Delphi-FFMPEG" + - packages for D10-D10.3 + - redistributable packages + - media for working examples and Haar-cascades + - examples + - object pascal sources for OpenCV, SDL, OpenGL + - attempt for opencv 3 + - 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 directory should be populated with sources for "Delphi-FFMPEG". +If it didn’t work, then +``` +git clone https://github.com/Laex/Delphi-FFMPEG.git +``` +Add the search path for the modules of the project in Delphi IDE
+"Tools-Options-Delphi Options-Library-Library path" or "Tools-Options-Language-Delphi-Library" ``` \source -\source\classes -\source\component -\source\Delphi-FFMPEG\source \source\opengl \source\sdl \source\sdl2 -\source\utils +\packages +\resource \resource\facedetectxml +\source3 +\Delphi-FFMPEG\source ``` -where `````` directory, which was unzipped project.
- -To install the components, open and install -``` -\source\component\DelphiXX\dclCommonOpenCVXXX.dpk -\source\component\DelphiXX\dclFFMSourceXXX.dpk -\source\component\DelphiXX\dclFMXOpenCVXXX.dpk -\source\component\DelphiXX\dclVCLOpenCVXXX.dpk -``` -## Verify that the environment is configured correctly +where `````` directory, which was unzipped (or cloned) repository.
+### 3. Verify that the environment is configured correctly Run from the repository ``` Delphi-OpenCV/CheckCVDep/CheckCVDep.exe @@ -95,6 +101,16 @@ OK OK ``` 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 +``` +\packages\Delphi XXX\rtpFFMPEG.dpk +\packages\Delphi XXX\rclVCLOpenCV.dpk +\packages\Delphi XXX\rclFMXOpenCV.dpk +\packages\Delphi XXX\dclVCLOpenCV.dpk +\packages\Delphi XXX\dclFMXOpenCV.dpk +``` ## Examples Open in Delphi IDE and compile:
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 ``` -\source\ffmpeg\examples +\Delphi-FFMPEG\examples ``` 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 [3]: https://www.libsdl.org/index.php [4]: https://github.com/opencv/opencv/releases/tag/2.4.13.6 -[5]: http://ffmpeg.zeranoe.com/builds/ +[5]: http://ffmpeg.zeranoe.com/builds/ \ No newline at end of file diff --git a/packages/Delphi 10 Seattle/dclFMXOpenCV.dproj b/packages/Delphi 10 Seattle/dclFMXOpenCV.dproj index 64442c8..63da060 100644 --- a/packages/Delphi 10 Seattle/dclFMXOpenCV.dproj +++ b/packages/Delphi 10 Seattle/dclFMXOpenCV.dproj @@ -145,16 +145,7 @@ true - - - 0 - .dll;.bpl - - - 1 - .dylib - - + Contents\Resources @@ -468,7 +459,16 @@ 1 - + + + 0 + .dll;.bpl + + + 1 + .dylib + + diff --git a/packages/Delphi 10 Seattle/dclVCLOpenCV.dproj b/packages/Delphi 10 Seattle/dclVCLOpenCV.dproj index 1c81e47..41d16b0 100644 --- a/packages/Delphi 10 Seattle/dclVCLOpenCV.dproj +++ b/packages/Delphi 10 Seattle/dclVCLOpenCV.dproj @@ -60,7 +60,7 @@ Debug - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) 1033 CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= true @@ -131,16 +131,7 @@ true - - - 0 - .dll;.bpl - - - 1 - .dylib - - + Contents\Resources @@ -454,7 +445,16 @@ 1 - + + + 0 + .dll;.bpl + + + 1 + .dylib + + diff --git a/packages/Delphi 10 Seattle/rclFMXOpenCV.dpk b/packages/Delphi 10 Seattle/rclFMXOpenCV.dpk index 7e2cfa1..f4b2e7b 100644 --- a/packages/Delphi 10 Seattle/rclFMXOpenCV.dpk +++ b/packages/Delphi 10 Seattle/rclFMXOpenCV.dpk @@ -36,6 +36,6 @@ requires contains ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas', - ocv.fmxutils in '..\..\ocv.fmxutils.pas'; + ocv.fmxutils in '..\..\source\ocv.fmxutils.pas'; end. diff --git a/packages/Delphi 10 Seattle/rclFMXOpenCV.dproj b/packages/Delphi 10 Seattle/rclFMXOpenCV.dproj index ceabdb1..0856e9d 100644 --- a/packages/Delphi 10 Seattle/rclFMXOpenCV.dproj +++ b/packages/Delphi 10 Seattle/rclFMXOpenCV.dproj @@ -33,6 +33,12 @@ Base true + + true + Cfg_2 + true + true + 1049 false @@ -71,6 +77,9 @@ false true + + Debug + MainSource @@ -79,7 +88,7 @@ - + Cfg_2 Base @@ -110,9 +119,364 @@ True False + + + + true + + + + + true + + + + + true + + + + + rclFMXOpenCV.bpl + true + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + + + + Contents\Resources + 1 + + + + + classes + 1 + + + + + Contents\MacOS + 0 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\drawable-xxhdpi + 1 + + + + + library\lib\mips + 1 + + + + + 0 + + + 1 + + + 1 + + + 1 + + + library\lib\armeabi-v7a + 1 + + + 1 + + + + + 0 + + + 1 + .framework + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + library\lib\x86 + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi + 1 + + + + + 0 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\drawable-normal + 1 + + + + + res\drawable-xhdpi + 1 + + + + + res\drawable-large + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + res\drawable-hdpi + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + + + 1 + + + 1 + + + 1 + + + + + res\values + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + + + res\drawable + 1 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 0 + .bpl + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-xlarge + 1 + + + + + res\drawable-ldpi + 1 + + + + + + + + + + + 12 + diff --git a/packages/Delphi 10 Seattle/rclVCLOpenCV.dpk b/packages/Delphi 10 Seattle/rclVCLOpenCV.dpk index f48c99f..39f0b59 100644 --- a/packages/Delphi 10 Seattle/rclVCLOpenCV.dpk +++ b/packages/Delphi 10 Seattle/rclVCLOpenCV.dpk @@ -35,29 +35,29 @@ requires rtpFFMPEG; contains - ocv.calib3d_c in '..\..\ocv.calib3d_c.pas', - ocv.compat in '..\..\ocv.compat.pas', - ocv.core.types_c in '..\..\ocv.core.types_c.pas', - ocv.core_c in '..\..\ocv.core_c.pas', - ocv.editor in '..\..\ocv.editor.pas', - ocv.haar in '..\..\ocv.haar.pas', - ocv.highgui_c in '..\..\ocv.highgui_c.pas', - ocv.imgproc.types_c in '..\..\ocv.imgproc.types_c.pas', - ocv.imgproc_c in '..\..\ocv.imgproc_c.pas', - ocv.legacy in '..\..\ocv.legacy.pas', - ocv.lib in '..\..\ocv.lib.pas', - ocv.lock in '..\..\ocv.lock.pas', - ocv.nonfree in '..\..\ocv.nonfree.pas', - ocv.objdetect_c in '..\..\ocv.objdetect_c.pas', - ocv.photo_c in '..\..\ocv.photo_c.pas', - ocv.tracking_c in '..\..\ocv.tracking_c.pas', - ocv.utils in '..\..\ocv.utils.pas', + ocv.calib3d_c in '..\..\source\ocv.calib3d_c.pas', + ocv.compat in '..\..\source\ocv.compat.pas', + ocv.core.types_c in '..\..\source\ocv.core.types_c.pas', + ocv.core_c in '..\..\source\ocv.core_c.pas', + ocv.editor in '..\..\source\ocv.editor.pas', + ocv.haar in '..\..\source\ocv.haar.pas', + ocv.highgui_c in '..\..\source\ocv.highgui_c.pas', + ocv.imgproc.types_c in '..\..\source\ocv.imgproc.types_c.pas', + ocv.imgproc_c in '..\..\source\ocv.imgproc_c.pas', + ocv.legacy in '..\..\source\ocv.legacy.pas', + ocv.lib in '..\..\source\ocv.lib.pas', + ocv.lock in '..\..\source\ocv.lock.pas', + ocv.nonfree in '..\..\source\ocv.nonfree.pas', + ocv.objdetect_c in '..\..\source\ocv.objdetect_c.pas', + ocv.photo_c in '..\..\source\ocv.photo_c.pas', + ocv.tracking_c in '..\..\source\ocv.tracking_c.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.proc in '..\ocv.comp.proc.pas', ocv.comp.Source in '..\ocv.comp.Source.pas', ocv.comp.Types in '..\ocv.comp.Types.pas', ocv.comp.VideoWriter in '..\ocv.comp.VideoWriter.pas', - ocv.comp.View in '..\ocv.comp.View.pas', - ocv.comp.FFMSource in '..\ocv.comp.FFMSource.pas'; + ocv.comp.View in '..\ocv.comp.View.pas'; end. diff --git a/packages/Delphi 10 Seattle/rclVCLOpenCV.dproj b/packages/Delphi 10 Seattle/rclVCLOpenCV.dproj index ecb3f38..2d9de48 100644 --- a/packages/Delphi 10 Seattle/rclVCLOpenCV.dproj +++ b/packages/Delphi 10 Seattle/rclVCLOpenCV.dproj @@ -61,7 +61,7 @@ Debug - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) 1033 CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= true @@ -87,31 +87,31 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - +
haarcascade.res
 @@ -150,16 +150,7 @@ true - - - 0 - .dll;.bpl - - - 1 - .dylib - - + Contents\Resources @@ -473,7 +464,16 @@ 1 - + + + 0 + .dll;.bpl + + + 1 + .dylib + + diff --git a/packages/Delphi 10 Seattle/rtpFFMPEG.dproj b/packages/Delphi 10 Seattle/rtpFFMPEG.dproj index 4b0dc3a..646ea2f 100644 --- a/packages/Delphi 10 Seattle/rtpFFMPEG.dproj +++ b/packages/Delphi 10 Seattle/rtpFFMPEG.dproj @@ -33,6 +33,12 @@ Base true + + true + Cfg_2 + true + true + 1049 false @@ -71,6 +77,9 @@ false true + + Debug + MainSource diff --git a/packages/Delphi 10.1 Berlin/rclFMXOpenCV.dpk b/packages/Delphi 10.1 Berlin/rclFMXOpenCV.dpk index 7e2cfa1..f4b2e7b 100644 --- a/packages/Delphi 10.1 Berlin/rclFMXOpenCV.dpk +++ b/packages/Delphi 10.1 Berlin/rclFMXOpenCV.dpk @@ -36,6 +36,6 @@ requires contains ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas', - ocv.fmxutils in '..\..\ocv.fmxutils.pas'; + ocv.fmxutils in '..\..\source\ocv.fmxutils.pas'; end. diff --git a/packages/Delphi 10.1 Berlin/rclFMXOpenCV.dproj b/packages/Delphi 10.1 Berlin/rclFMXOpenCV.dproj index 5c231ab..1d8b40b 100644 --- a/packages/Delphi 10.1 Berlin/rclFMXOpenCV.dproj +++ b/packages/Delphi 10.1 Berlin/rclFMXOpenCV.dproj @@ -33,6 +33,12 @@ Base true + + true + Cfg_2 + true + true + OpenCV FMX runtime library 1049 @@ -72,6 +78,9 @@ true false + + Debug + MainSource diff --git a/packages/Delphi 10.1 Berlin/rclVCLOpenCV.dpk b/packages/Delphi 10.1 Berlin/rclVCLOpenCV.dpk index f48c99f..39f0b59 100644 --- a/packages/Delphi 10.1 Berlin/rclVCLOpenCV.dpk +++ b/packages/Delphi 10.1 Berlin/rclVCLOpenCV.dpk @@ -35,29 +35,29 @@ requires rtpFFMPEG; contains - ocv.calib3d_c in '..\..\ocv.calib3d_c.pas', - ocv.compat in '..\..\ocv.compat.pas', - ocv.core.types_c in '..\..\ocv.core.types_c.pas', - ocv.core_c in '..\..\ocv.core_c.pas', - ocv.editor in '..\..\ocv.editor.pas', - ocv.haar in '..\..\ocv.haar.pas', - ocv.highgui_c in '..\..\ocv.highgui_c.pas', - ocv.imgproc.types_c in '..\..\ocv.imgproc.types_c.pas', - ocv.imgproc_c in '..\..\ocv.imgproc_c.pas', - ocv.legacy in '..\..\ocv.legacy.pas', - ocv.lib in '..\..\ocv.lib.pas', - ocv.lock in '..\..\ocv.lock.pas', - ocv.nonfree in '..\..\ocv.nonfree.pas', - ocv.objdetect_c in '..\..\ocv.objdetect_c.pas', - ocv.photo_c in '..\..\ocv.photo_c.pas', - ocv.tracking_c in '..\..\ocv.tracking_c.pas', - ocv.utils in '..\..\ocv.utils.pas', + ocv.calib3d_c in '..\..\source\ocv.calib3d_c.pas', + ocv.compat in '..\..\source\ocv.compat.pas', + ocv.core.types_c in '..\..\source\ocv.core.types_c.pas', + ocv.core_c in '..\..\source\ocv.core_c.pas', + ocv.editor in '..\..\source\ocv.editor.pas', + ocv.haar in '..\..\source\ocv.haar.pas', + ocv.highgui_c in '..\..\source\ocv.highgui_c.pas', + ocv.imgproc.types_c in '..\..\source\ocv.imgproc.types_c.pas', + ocv.imgproc_c in '..\..\source\ocv.imgproc_c.pas', + ocv.legacy in '..\..\source\ocv.legacy.pas', + ocv.lib in '..\..\source\ocv.lib.pas', + ocv.lock in '..\..\source\ocv.lock.pas', + ocv.nonfree in '..\..\source\ocv.nonfree.pas', + ocv.objdetect_c in '..\..\source\ocv.objdetect_c.pas', + ocv.photo_c in '..\..\source\ocv.photo_c.pas', + ocv.tracking_c in '..\..\source\ocv.tracking_c.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.proc in '..\ocv.comp.proc.pas', ocv.comp.Source in '..\ocv.comp.Source.pas', ocv.comp.Types in '..\ocv.comp.Types.pas', ocv.comp.VideoWriter in '..\ocv.comp.VideoWriter.pas', - ocv.comp.View in '..\ocv.comp.View.pas', - ocv.comp.FFMSource in '..\ocv.comp.FFMSource.pas'; + ocv.comp.View in '..\ocv.comp.View.pas'; end. diff --git a/packages/Delphi 10.1 Berlin/rclVCLOpenCV.dproj b/packages/Delphi 10.1 Berlin/rclVCLOpenCV.dproj index f8f9eb2..a90be6c 100644 --- a/packages/Delphi 10.1 Berlin/rclVCLOpenCV.dproj +++ b/packages/Delphi 10.1 Berlin/rclVCLOpenCV.dproj @@ -65,7 +65,7 @@ 1033 CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName) Debug - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) RELEASE;$(DCC_Define) @@ -88,33 +88,30 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - -
haarcascade.res
- Cfg_2 Base diff --git a/packages/Delphi 10.1 Berlin/rtpFFMPEG.dproj b/packages/Delphi 10.1 Berlin/rtpFFMPEG.dproj index ba627ff..9eb00fb 100644 --- a/packages/Delphi 10.1 Berlin/rtpFFMPEG.dproj +++ b/packages/Delphi 10.1 Berlin/rtpFFMPEG.dproj @@ -33,6 +33,12 @@ Base true + + true + Cfg_2 + true + true + FFMPEG runtime library 1049 @@ -72,6 +78,9 @@ true false + + Debug + MainSource diff --git a/packages/Delphi 10.2 Tokyo/rclFMXOpenCV.dpk b/packages/Delphi 10.2 Tokyo/rclFMXOpenCV.dpk index 7e2cfa1..f4b2e7b 100644 --- a/packages/Delphi 10.2 Tokyo/rclFMXOpenCV.dpk +++ b/packages/Delphi 10.2 Tokyo/rclFMXOpenCV.dpk @@ -36,6 +36,6 @@ requires contains ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas', - ocv.fmxutils in '..\..\ocv.fmxutils.pas'; + ocv.fmxutils in '..\..\source\ocv.fmxutils.pas'; end. diff --git a/packages/Delphi 10.2 Tokyo/rclVCLOpenCV.dproj b/packages/Delphi 10.2 Tokyo/rclVCLOpenCV.dproj index a28e98e..4b8b8a5 100644 --- a/packages/Delphi 10.2 Tokyo/rclVCLOpenCV.dproj +++ b/packages/Delphi 10.2 Tokyo/rclVCLOpenCV.dproj @@ -61,7 +61,7 @@ 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 - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug true CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) @@ -112,7 +112,7 @@ - +
haarcascade.res
 diff --git a/packages/Delphi 2010-XE8/dclFMXOpenCV.dpk b/packages/Delphi 2010-XE8/dclFMXOpenCV.dpk index f999d0a..9efde36 100644 --- a/packages/Delphi 2010-XE8/dclFMXOpenCV.dpk +++ b/packages/Delphi 2010-XE8/dclFMXOpenCV.dpk @@ -26,8 +26,8 @@ package dclFMXOpenCV; {$IMAGEBASE $400000} {$DEFINE DEBUG} {$ENDIF IMPLICITBUILDING} -{$DESCRIPTION 'OpenCV FMX designtime component'} {$IMPLICITBUILD ON} +{$DESCRIPTION 'OpenCV FMX designtime component'} requires designide, diff --git a/packages/Delphi 2010-XE8/dclVCLOpenCV.dpk b/packages/Delphi 2010-XE8/dclVCLOpenCV.dpk index 5357c51..52f60c2 100644 --- a/packages/Delphi 2010-XE8/dclVCLOpenCV.dpk +++ b/packages/Delphi 2010-XE8/dclVCLOpenCV.dpk @@ -26,8 +26,8 @@ package dclVCLOpenCV; {$IMAGEBASE $400000} {$DEFINE DEBUG} {$ENDIF IMPLICITBUILDING} -{$DESCRIPTION 'OpenCV VCL designtime component'} {$IMPLICITBUILD ON} +{$DESCRIPTION 'OpenCV VCL designtime component'} requires designide, diff --git a/packages/Delphi 2010-XE8/rclFMXOpenCV.dpk b/packages/Delphi 2010-XE8/rclFMXOpenCV.dpk index 7e2cfa1..45967d6 100644 --- a/packages/Delphi 2010-XE8/rclFMXOpenCV.dpk +++ b/packages/Delphi 2010-XE8/rclFMXOpenCV.dpk @@ -25,7 +25,6 @@ package rclFMXOpenCV; {$IMAGEBASE $400000} {$DEFINE DEBUG} {$ENDIF IMPLICITBUILDING} -{$DESCRIPTION 'OpenCV FMX runtime library'} {$RUNONLY} {$IMPLICITBUILD ON} @@ -36,6 +35,6 @@ requires contains ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas', - ocv.fmxutils in '..\..\ocv.fmxutils.pas'; + ocv.fmxutils in '..\..\source\ocv.fmxutils.pas'; end. diff --git a/packages/Delphi 2010-XE8/rclVCLOpenCV.dpk b/packages/Delphi 2010-XE8/rclVCLOpenCV.dpk index f48c99f..b08bcba 100644 --- a/packages/Delphi 2010-XE8/rclVCLOpenCV.dpk +++ b/packages/Delphi 2010-XE8/rclVCLOpenCV.dpk @@ -25,7 +25,6 @@ package rclVCLOpenCV; {$IMAGEBASE $400000} {$DEFINE DEBUG} {$ENDIF IMPLICITBUILDING} -{$DESCRIPTION 'OpenCV VCL runtime library'} {$RUNONLY} {$IMPLICITBUILD ON} @@ -35,23 +34,23 @@ requires rtpFFMPEG; contains - ocv.calib3d_c in '..\..\ocv.calib3d_c.pas', - ocv.compat in '..\..\ocv.compat.pas', - ocv.core.types_c in '..\..\ocv.core.types_c.pas', - ocv.core_c in '..\..\ocv.core_c.pas', - ocv.editor in '..\..\ocv.editor.pas', - ocv.haar in '..\..\ocv.haar.pas', - ocv.highgui_c in '..\..\ocv.highgui_c.pas', - ocv.imgproc.types_c in '..\..\ocv.imgproc.types_c.pas', - ocv.imgproc_c in '..\..\ocv.imgproc_c.pas', - ocv.legacy in '..\..\ocv.legacy.pas', - ocv.lib in '..\..\ocv.lib.pas', - ocv.lock in '..\..\ocv.lock.pas', - ocv.nonfree in '..\..\ocv.nonfree.pas', - ocv.objdetect_c in '..\..\ocv.objdetect_c.pas', - ocv.photo_c in '..\..\ocv.photo_c.pas', - ocv.tracking_c in '..\..\ocv.tracking_c.pas', - ocv.utils in '..\..\ocv.utils.pas', + ocv.calib3d_c in '..\ocv.calib3d_c.pas', + ocv.compat in '..\ocv.compat.pas', + ocv.core.types_c in '..\ocv.core.types_c.pas', + ocv.core_c in '..\ocv.core_c.pas', + ocv.editor in '..\ocv.editor.pas', + ocv.haar in '..\ocv.haar.pas', + ocv.highgui_c in '..\ocv.highgui_c.pas', + ocv.imgproc.types_c in '..\ocv.imgproc.types_c.pas', + ocv.imgproc_c in '..\ocv.imgproc_c.pas', + ocv.legacy in '..\ocv.legacy.pas', + ocv.lib in '..\ocv.lib.pas', + ocv.lock in '..\ocv.lock.pas', + ocv.nonfree in '..\ocv.nonfree.pas', + ocv.objdetect_c in '..\ocv.objdetect_c.pas', + ocv.photo_c in '..\ocv.photo_c.pas', + ocv.tracking_c in '..\ocv.tracking_c.pas', + ocv.utils in '..\ocv.utils.pas', ocv.comp.ImageOperation in '..\ocv.comp.ImageOperation.pas', ocv.comp.proc in '..\ocv.comp.proc.pas', ocv.comp.Source in '..\ocv.comp.Source.pas', diff --git a/packages/Delphi 2010-XE8/rtpFFMPEG.dpk b/packages/Delphi 2010-XE8/rtpFFMPEG.dpk index 49b4528..6a5986c 100644 --- a/packages/Delphi 2010-XE8/rtpFFMPEG.dpk +++ b/packages/Delphi 2010-XE8/rtpFFMPEG.dpk @@ -33,14 +33,14 @@ requires rtl; contains - ffmpeg_types in '..\..\Delphi-FFMPEG\source\ffmpeg_types.pas', - libavcodec in '..\..\Delphi-FFMPEG\source\libavcodec.pas', - libavdevice in '..\..\Delphi-FFMPEG\source\libavdevice.pas', - libavfilter in '..\..\Delphi-FFMPEG\source\libavfilter.pas', - libavformat in '..\..\Delphi-FFMPEG\source\libavformat.pas', - libavutil in '..\..\Delphi-FFMPEG\source\libavutil.pas', - libpostproc in '..\..\Delphi-FFMPEG\source\libpostproc.pas', - libswresample in '..\..\Delphi-FFMPEG\source\libswresample.pas', - libswscale in '..\..\Delphi-FFMPEG\source\libswscale.pas'; + ffmpeg_types in '..\Delphi-FFMPEG\source\ffmpeg_types.pas', + libavcodec in '..\Delphi-FFMPEG\source\libavcodec.pas', + libavdevice in '..\Delphi-FFMPEG\source\libavdevice.pas', + libavfilter in '..\Delphi-FFMPEG\source\libavfilter.pas', + libavformat in '..\Delphi-FFMPEG\source\libavformat.pas', + libavutil in '..\Delphi-FFMPEG\source\libavutil.pas', + libpostproc in '..\Delphi-FFMPEG\source\libpostproc.pas', + libswresample in '..\Delphi-FFMPEG\source\libswresample.pas', + libswscale in '..\Delphi-FFMPEG\source\libswscale.pas'; end. diff --git a/redist/ffmpeg/x64/avcodec-58.dll b/redist/ffmpeg/x64/avcodec-58.dll new file mode 100644 index 0000000..99aaea4 Binary files /dev/null and b/redist/ffmpeg/x64/avcodec-58.dll differ diff --git a/redist/ffmpeg/x64/avdevice-57.dll b/redist/ffmpeg/x64/avdevice-57.dll deleted file mode 100644 index 0f9aede..0000000 Binary files a/redist/ffmpeg/x64/avdevice-57.dll and /dev/null differ diff --git a/redist/ffmpeg/x64/avdevice-58.dll b/redist/ffmpeg/x64/avdevice-58.dll new file mode 100644 index 0000000..57ceaae Binary files /dev/null and b/redist/ffmpeg/x64/avdevice-58.dll differ diff --git a/redist/ffmpeg/x64/avfilter-6.dll b/redist/ffmpeg/x64/avfilter-6.dll deleted file mode 100644 index 8cd4dbe..0000000 Binary files a/redist/ffmpeg/x64/avfilter-6.dll and /dev/null differ diff --git a/redist/ffmpeg/x64/avfilter-7.dll b/redist/ffmpeg/x64/avfilter-7.dll new file mode 100644 index 0000000..babd622 Binary files /dev/null and b/redist/ffmpeg/x64/avfilter-7.dll differ diff --git a/redist/ffmpeg/x64/avformat-57.dll b/redist/ffmpeg/x64/avformat-57.dll deleted file mode 100644 index f14b84f..0000000 Binary files a/redist/ffmpeg/x64/avformat-57.dll and /dev/null differ diff --git a/redist/ffmpeg/x64/avformat-58.dll b/redist/ffmpeg/x64/avformat-58.dll new file mode 100644 index 0000000..23525ce Binary files /dev/null and b/redist/ffmpeg/x64/avformat-58.dll differ diff --git a/redist/ffmpeg/x64/avutil-55.dll b/redist/ffmpeg/x64/avutil-55.dll deleted file mode 100644 index 68de2d9..0000000 Binary files a/redist/ffmpeg/x64/avutil-55.dll and /dev/null differ diff --git a/redist/ffmpeg/x64/avutil-56.dll b/redist/ffmpeg/x64/avutil-56.dll new file mode 100644 index 0000000..553bd48 Binary files /dev/null and b/redist/ffmpeg/x64/avutil-56.dll differ diff --git a/redist/ffmpeg/x64/postproc-54.dll b/redist/ffmpeg/x64/postproc-54.dll deleted file mode 100644 index 4cec0fb..0000000 Binary files a/redist/ffmpeg/x64/postproc-54.dll and /dev/null differ diff --git a/redist/ffmpeg/x64/postproc-55.dll b/redist/ffmpeg/x64/postproc-55.dll new file mode 100644 index 0000000..20a40a6 Binary files /dev/null and b/redist/ffmpeg/x64/postproc-55.dll differ diff --git a/redist/ffmpeg/x64/swresample-2.dll b/redist/ffmpeg/x64/swresample-2.dll deleted file mode 100644 index d414410..0000000 Binary files a/redist/ffmpeg/x64/swresample-2.dll and /dev/null differ diff --git a/redist/ffmpeg/x64/swresample-3.dll b/redist/ffmpeg/x64/swresample-3.dll new file mode 100644 index 0000000..05528b4 Binary files /dev/null and b/redist/ffmpeg/x64/swresample-3.dll differ diff --git a/redist/ffmpeg/x64/swscale-4.dll b/redist/ffmpeg/x64/swscale-4.dll deleted file mode 100644 index 78548c1..0000000 Binary files a/redist/ffmpeg/x64/swscale-4.dll and /dev/null differ diff --git a/redist/ffmpeg/x64/swscale-5.dll b/redist/ffmpeg/x64/swscale-5.dll new file mode 100644 index 0000000..f88ebe7 Binary files /dev/null and b/redist/ffmpeg/x64/swscale-5.dll differ diff --git a/redist/ffmpeg/x86/avcodec-57.dll b/redist/ffmpeg/x86/avcodec-57.dll deleted file mode 100644 index caac17b..0000000 Binary files a/redist/ffmpeg/x86/avcodec-57.dll and /dev/null differ diff --git a/redist/ffmpeg/x64/avcodec-57.dll b/redist/ffmpeg/x86/avcodec-58.dll similarity index 62% rename from redist/ffmpeg/x64/avcodec-57.dll rename to redist/ffmpeg/x86/avcodec-58.dll index bbbe5c8..6718d82 100644 Binary files a/redist/ffmpeg/x64/avcodec-57.dll and b/redist/ffmpeg/x86/avcodec-58.dll differ diff --git a/redist/ffmpeg/x86/avdevice-57.dll b/redist/ffmpeg/x86/avdevice-57.dll deleted file mode 100644 index bb7a2cf..0000000 Binary files a/redist/ffmpeg/x86/avdevice-57.dll and /dev/null differ diff --git a/redist/ffmpeg/x86/avdevice-58.dll b/redist/ffmpeg/x86/avdevice-58.dll new file mode 100644 index 0000000..cdb8204 Binary files /dev/null and b/redist/ffmpeg/x86/avdevice-58.dll differ diff --git a/redist/ffmpeg/x86/avfilter-6.dll b/redist/ffmpeg/x86/avfilter-6.dll deleted file mode 100644 index 095ca8c..0000000 Binary files a/redist/ffmpeg/x86/avfilter-6.dll and /dev/null differ diff --git a/redist/ffmpeg/x86/avfilter-7.dll b/redist/ffmpeg/x86/avfilter-7.dll new file mode 100644 index 0000000..8e8c82d Binary files /dev/null and b/redist/ffmpeg/x86/avfilter-7.dll differ diff --git a/redist/ffmpeg/x86/avformat-57.dll b/redist/ffmpeg/x86/avformat-57.dll deleted file mode 100644 index 6622634..0000000 Binary files a/redist/ffmpeg/x86/avformat-57.dll and /dev/null differ diff --git a/redist/ffmpeg/x86/avformat-58.dll b/redist/ffmpeg/x86/avformat-58.dll new file mode 100644 index 0000000..4ae9973 Binary files /dev/null and b/redist/ffmpeg/x86/avformat-58.dll differ diff --git a/redist/ffmpeg/x86/avutil-55.dll b/redist/ffmpeg/x86/avutil-55.dll deleted file mode 100644 index d9339d3..0000000 Binary files a/redist/ffmpeg/x86/avutil-55.dll and /dev/null differ diff --git a/redist/ffmpeg/x86/avutil-56.dll b/redist/ffmpeg/x86/avutil-56.dll new file mode 100644 index 0000000..ef58f89 Binary files /dev/null and b/redist/ffmpeg/x86/avutil-56.dll differ diff --git a/redist/ffmpeg/x86/postproc-54.dll b/redist/ffmpeg/x86/postproc-54.dll deleted file mode 100644 index e6e0e94..0000000 Binary files a/redist/ffmpeg/x86/postproc-54.dll and /dev/null differ diff --git a/redist/ffmpeg/x86/postproc-55.dll b/redist/ffmpeg/x86/postproc-55.dll new file mode 100644 index 0000000..627a820 Binary files /dev/null and b/redist/ffmpeg/x86/postproc-55.dll differ diff --git a/redist/ffmpeg/x86/swresample-2.dll b/redist/ffmpeg/x86/swresample-2.dll deleted file mode 100644 index cc57da9..0000000 Binary files a/redist/ffmpeg/x86/swresample-2.dll and /dev/null differ diff --git a/redist/ffmpeg/x86/swresample-3.dll b/redist/ffmpeg/x86/swresample-3.dll new file mode 100644 index 0000000..013e846 Binary files /dev/null and b/redist/ffmpeg/x86/swresample-3.dll differ diff --git a/redist/ffmpeg/x86/swscale-4.dll b/redist/ffmpeg/x86/swscale-4.dll deleted file mode 100644 index 99f3803..0000000 Binary files a/redist/ffmpeg/x86/swscale-4.dll and /dev/null differ diff --git a/redist/ffmpeg/x86/swscale-5.dll b/redist/ffmpeg/x86/swscale-5.dll new file mode 100644 index 0000000..62232dc Binary files /dev/null and b/redist/ffmpeg/x86/swscale-5.dll differ