diff --git a/.gitignore b/.gitignore index efe8304..064397a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,10 @@ Release ipch lib /resource/result/*.* -/bin/Win32/*.exe -/bin/Win64/*.exe +*.exe +*.dll +!opencv_classes249.dll +!opencv_classes249d.dll #Files *.ini *.bsc diff --git a/README.md b/README.md index 5d58eba..89f4236 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,24 @@ ###Delphi-OpenCV * OpenCV version - 2.4.9
* Development environment - Delphi 2010-XE7
- -Requires installed [Visual C++ redistributable for Visual Studio 2013][2]
- -#####Contributors: +####Contributors: ``` Laentir Valetov (email: laex@bk.ru) Mikhail Grigorev (email: sleuthhound@gmail.com) ``` + +####Requirements: +* Requires installed [Visual C++ redistributable for Visual Studio 2013][2]
+* Some examples (FFMPEG) required [SDL 2.0 and SDL 1.2][3]
+* Warning! Dynamic OpenCV library is not included in the repository!
+Dynamic library OpenCV need to download [here] [4] +* Shared library FFMPEG for Windows can be downloaded from [link] [5] + ####How to install: -Download the archive [link][1]
+Download the [archive][1]
Unzip it to a convenient directory, thus get the following directory structure
``` - - Directory, such as "C:\OpenCV\" + - Directory, for example, "C:\Delphi\OpenCV\" @@ -33,11 +38,8 @@ Add the search path for the modules of the project in Delphi IDE (Tools-Options- where `````` directory, which was unzipped project.
Add to your PATH variable path to the library "opencv_*.dll" and FFMPEG dll. * for Win32 ```\bin\Win32``` -* for Win64 ```\bin\Win64``` - -Or - -For 64-bit +* for Win64 ```\bin\Win64```
+OR
For 64-bit ``` 1. Copy the dll files from the \redist\VC2013x64\ to C:\Windows\System32\ 2. Copy all the dll from \bin\Win64 in the C:\Windows\System32\ @@ -79,3 +81,6 @@ Examples of use of components ``` [1]: https://github.com/Laex/Delphi-OpenCV/archive/master.zip [2]: http://www.microsoft.com/ru-ru/download/details.aspx?id=40784 +[3]: https://www.libsdl.org/index.php +[4]: http://opencv.org/downloads.html +[5]: http://ffmpeg.zeranoe.com/builds/ \ No newline at end of file diff --git a/bin/Win32/SDL.dll b/bin/Win32/SDL.dll deleted file mode 100644 index 69fd61e..0000000 Binary files a/bin/Win32/SDL.dll and /dev/null differ diff --git a/bin/Win32/SDL2.dll b/bin/Win32/SDL2.dll deleted file mode 100644 index 18d707f..0000000 Binary files a/bin/Win32/SDL2.dll and /dev/null differ diff --git a/bin/Win32/avcodec-56.dll b/bin/Win32/avcodec-56.dll deleted file mode 100644 index 471d511..0000000 Binary files a/bin/Win32/avcodec-56.dll and /dev/null differ diff --git a/bin/Win32/avdevice-56.dll b/bin/Win32/avdevice-56.dll deleted file mode 100644 index a7a46eb..0000000 Binary files a/bin/Win32/avdevice-56.dll and /dev/null differ diff --git a/bin/Win32/avfilter-5.dll b/bin/Win32/avfilter-5.dll deleted file mode 100644 index 26f1ec0..0000000 Binary files a/bin/Win32/avfilter-5.dll and /dev/null differ diff --git a/bin/Win32/avformat-56.dll b/bin/Win32/avformat-56.dll deleted file mode 100644 index 18afede..0000000 Binary files a/bin/Win32/avformat-56.dll and /dev/null differ diff --git a/bin/Win32/avutil-54.dll b/bin/Win32/avutil-54.dll deleted file mode 100644 index 261962b..0000000 Binary files a/bin/Win32/avutil-54.dll and /dev/null differ diff --git a/bin/Win32/glut32.dll b/bin/Win32/glut32.dll deleted file mode 100644 index 106646f..0000000 Binary files a/bin/Win32/glut32.dll and /dev/null differ diff --git a/bin/Win32/opencv_calib3d249.dll b/bin/Win32/opencv_calib3d249.dll deleted file mode 100644 index 98af833..0000000 Binary files a/bin/Win32/opencv_calib3d249.dll and /dev/null differ diff --git a/bin/Win32/opencv_calib3d249d.dll b/bin/Win32/opencv_calib3d249d.dll deleted file mode 100644 index 6d0c5ae..0000000 Binary files a/bin/Win32/opencv_calib3d249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_contrib249.dll b/bin/Win32/opencv_contrib249.dll deleted file mode 100644 index d1e292a..0000000 Binary files a/bin/Win32/opencv_contrib249.dll and /dev/null differ diff --git a/bin/Win32/opencv_contrib249d.dll b/bin/Win32/opencv_contrib249d.dll deleted file mode 100644 index 1196a61..0000000 Binary files a/bin/Win32/opencv_contrib249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_core249.dll b/bin/Win32/opencv_core249.dll deleted file mode 100644 index b4a153f..0000000 Binary files a/bin/Win32/opencv_core249.dll and /dev/null differ diff --git a/bin/Win32/opencv_core249d.dll b/bin/Win32/opencv_core249d.dll deleted file mode 100644 index e8cfe56..0000000 Binary files a/bin/Win32/opencv_core249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_features2d249.dll b/bin/Win32/opencv_features2d249.dll deleted file mode 100644 index 4c023e7..0000000 Binary files a/bin/Win32/opencv_features2d249.dll and /dev/null differ diff --git a/bin/Win32/opencv_features2d249d.dll b/bin/Win32/opencv_features2d249d.dll deleted file mode 100644 index e8d82c5..0000000 Binary files a/bin/Win32/opencv_features2d249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_ffmpeg249.dll b/bin/Win32/opencv_ffmpeg249.dll deleted file mode 100644 index b1e70df..0000000 Binary files a/bin/Win32/opencv_ffmpeg249.dll and /dev/null differ diff --git a/bin/Win32/opencv_flann249.dll b/bin/Win32/opencv_flann249.dll deleted file mode 100644 index b112ac3..0000000 Binary files a/bin/Win32/opencv_flann249.dll and /dev/null differ diff --git a/bin/Win32/opencv_flann249d.dll b/bin/Win32/opencv_flann249d.dll deleted file mode 100644 index ad45e5f..0000000 Binary files a/bin/Win32/opencv_flann249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_gpu249.dll b/bin/Win32/opencv_gpu249.dll deleted file mode 100644 index 41e5624..0000000 Binary files a/bin/Win32/opencv_gpu249.dll and /dev/null differ diff --git a/bin/Win32/opencv_gpu249d.dll b/bin/Win32/opencv_gpu249d.dll deleted file mode 100644 index 65e5933..0000000 Binary files a/bin/Win32/opencv_gpu249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_highgui249.dll b/bin/Win32/opencv_highgui249.dll deleted file mode 100644 index a3ceb37..0000000 Binary files a/bin/Win32/opencv_highgui249.dll and /dev/null differ diff --git a/bin/Win32/opencv_highgui249d.dll b/bin/Win32/opencv_highgui249d.dll deleted file mode 100644 index b278829..0000000 Binary files a/bin/Win32/opencv_highgui249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_imgproc249.dll b/bin/Win32/opencv_imgproc249.dll deleted file mode 100644 index b546713..0000000 Binary files a/bin/Win32/opencv_imgproc249.dll and /dev/null differ diff --git a/bin/Win32/opencv_imgproc249d.dll b/bin/Win32/opencv_imgproc249d.dll deleted file mode 100644 index 77ea1fb..0000000 Binary files a/bin/Win32/opencv_imgproc249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_legacy249.dll b/bin/Win32/opencv_legacy249.dll deleted file mode 100644 index 455a124..0000000 Binary files a/bin/Win32/opencv_legacy249.dll and /dev/null differ diff --git a/bin/Win32/opencv_legacy249d.dll b/bin/Win32/opencv_legacy249d.dll deleted file mode 100644 index 56d75a9..0000000 Binary files a/bin/Win32/opencv_legacy249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_ml249.dll b/bin/Win32/opencv_ml249.dll deleted file mode 100644 index 877aec0..0000000 Binary files a/bin/Win32/opencv_ml249.dll and /dev/null differ diff --git a/bin/Win32/opencv_ml249d.dll b/bin/Win32/opencv_ml249d.dll deleted file mode 100644 index db7fd03..0000000 Binary files a/bin/Win32/opencv_ml249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_nonfree249.dll b/bin/Win32/opencv_nonfree249.dll deleted file mode 100644 index c4018b4..0000000 Binary files a/bin/Win32/opencv_nonfree249.dll and /dev/null differ diff --git a/bin/Win32/opencv_nonfree249d.dll b/bin/Win32/opencv_nonfree249d.dll deleted file mode 100644 index 84e358f..0000000 Binary files a/bin/Win32/opencv_nonfree249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_objdetect249.dll b/bin/Win32/opencv_objdetect249.dll deleted file mode 100644 index a7fc8b7..0000000 Binary files a/bin/Win32/opencv_objdetect249.dll and /dev/null differ diff --git a/bin/Win32/opencv_objdetect249d.dll b/bin/Win32/opencv_objdetect249d.dll deleted file mode 100644 index 21cde27..0000000 Binary files a/bin/Win32/opencv_objdetect249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_ocl249.dll b/bin/Win32/opencv_ocl249.dll deleted file mode 100644 index 00002fe..0000000 Binary files a/bin/Win32/opencv_ocl249.dll and /dev/null differ diff --git a/bin/Win32/opencv_ocl249d.dll b/bin/Win32/opencv_ocl249d.dll deleted file mode 100644 index 0856d3d..0000000 Binary files a/bin/Win32/opencv_ocl249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_photo249.dll b/bin/Win32/opencv_photo249.dll deleted file mode 100644 index 8ef9e0a..0000000 Binary files a/bin/Win32/opencv_photo249.dll and /dev/null differ diff --git a/bin/Win32/opencv_photo249d.dll b/bin/Win32/opencv_photo249d.dll deleted file mode 100644 index d8e1c36..0000000 Binary files a/bin/Win32/opencv_photo249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_stitching249.dll b/bin/Win32/opencv_stitching249.dll deleted file mode 100644 index 8bea38e..0000000 Binary files a/bin/Win32/opencv_stitching249.dll and /dev/null differ diff --git a/bin/Win32/opencv_stitching249d.dll b/bin/Win32/opencv_stitching249d.dll deleted file mode 100644 index 1b5ad10..0000000 Binary files a/bin/Win32/opencv_stitching249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_superres249.dll b/bin/Win32/opencv_superres249.dll deleted file mode 100644 index dc77b9c..0000000 Binary files a/bin/Win32/opencv_superres249.dll and /dev/null differ diff --git a/bin/Win32/opencv_superres249d.dll b/bin/Win32/opencv_superres249d.dll deleted file mode 100644 index bd10927..0000000 Binary files a/bin/Win32/opencv_superres249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_video249.dll b/bin/Win32/opencv_video249.dll deleted file mode 100644 index a706c03..0000000 Binary files a/bin/Win32/opencv_video249.dll and /dev/null differ diff --git a/bin/Win32/opencv_video249d.dll b/bin/Win32/opencv_video249d.dll deleted file mode 100644 index 04c00a2..0000000 Binary files a/bin/Win32/opencv_video249d.dll and /dev/null differ diff --git a/bin/Win32/opencv_videostab249.dll b/bin/Win32/opencv_videostab249.dll deleted file mode 100644 index f47c2bc..0000000 Binary files a/bin/Win32/opencv_videostab249.dll and /dev/null differ diff --git a/bin/Win32/opencv_videostab249d.dll b/bin/Win32/opencv_videostab249d.dll deleted file mode 100644 index 6ccfafb..0000000 Binary files a/bin/Win32/opencv_videostab249d.dll and /dev/null differ diff --git a/bin/Win32/postproc-53.dll b/bin/Win32/postproc-53.dll deleted file mode 100644 index a7f981e..0000000 Binary files a/bin/Win32/postproc-53.dll and /dev/null differ diff --git a/bin/Win32/swresample-1.dll b/bin/Win32/swresample-1.dll deleted file mode 100644 index 2597d3b..0000000 Binary files a/bin/Win32/swresample-1.dll and /dev/null differ diff --git a/bin/Win32/swscale-3.dll b/bin/Win32/swscale-3.dll deleted file mode 100644 index 085b81c..0000000 Binary files a/bin/Win32/swscale-3.dll and /dev/null differ diff --git a/bin/Win64/avcodec-56.dll b/bin/Win64/avcodec-56.dll deleted file mode 100644 index d785205..0000000 Binary files a/bin/Win64/avcodec-56.dll and /dev/null differ diff --git a/bin/Win64/avdevice-56.dll b/bin/Win64/avdevice-56.dll deleted file mode 100644 index 4f93d4a..0000000 Binary files a/bin/Win64/avdevice-56.dll and /dev/null differ diff --git a/bin/Win64/avfilter-5.dll b/bin/Win64/avfilter-5.dll deleted file mode 100644 index 772a431..0000000 Binary files a/bin/Win64/avfilter-5.dll and /dev/null differ diff --git a/bin/Win64/avformat-56.dll b/bin/Win64/avformat-56.dll deleted file mode 100644 index fa61124..0000000 Binary files a/bin/Win64/avformat-56.dll and /dev/null differ diff --git a/bin/Win64/avutil-54.dll b/bin/Win64/avutil-54.dll deleted file mode 100644 index b03454c..0000000 Binary files a/bin/Win64/avutil-54.dll and /dev/null differ diff --git a/bin/Win64/opencv_calib3d249.dll b/bin/Win64/opencv_calib3d249.dll deleted file mode 100644 index cbace9e..0000000 Binary files a/bin/Win64/opencv_calib3d249.dll and /dev/null differ diff --git a/bin/Win64/opencv_calib3d249d.dll b/bin/Win64/opencv_calib3d249d.dll deleted file mode 100644 index 930131a..0000000 Binary files a/bin/Win64/opencv_calib3d249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_contrib249.dll b/bin/Win64/opencv_contrib249.dll deleted file mode 100644 index 0057519..0000000 Binary files a/bin/Win64/opencv_contrib249.dll and /dev/null differ diff --git a/bin/Win64/opencv_contrib249d.dll b/bin/Win64/opencv_contrib249d.dll deleted file mode 100644 index 97f4e7e..0000000 Binary files a/bin/Win64/opencv_contrib249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_core249.dll b/bin/Win64/opencv_core249.dll deleted file mode 100644 index a16b46c..0000000 Binary files a/bin/Win64/opencv_core249.dll and /dev/null differ diff --git a/bin/Win64/opencv_core249d.dll b/bin/Win64/opencv_core249d.dll deleted file mode 100644 index 5aa5e7e..0000000 Binary files a/bin/Win64/opencv_core249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_features2d249.dll b/bin/Win64/opencv_features2d249.dll deleted file mode 100644 index d778f94..0000000 Binary files a/bin/Win64/opencv_features2d249.dll and /dev/null differ diff --git a/bin/Win64/opencv_features2d249d.dll b/bin/Win64/opencv_features2d249d.dll deleted file mode 100644 index a759c9a..0000000 Binary files a/bin/Win64/opencv_features2d249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_ffmpeg249_64.dll b/bin/Win64/opencv_ffmpeg249_64.dll deleted file mode 100644 index 37236e5..0000000 Binary files a/bin/Win64/opencv_ffmpeg249_64.dll and /dev/null differ diff --git a/bin/Win64/opencv_flann249.dll b/bin/Win64/opencv_flann249.dll deleted file mode 100644 index 05c059b..0000000 Binary files a/bin/Win64/opencv_flann249.dll and /dev/null differ diff --git a/bin/Win64/opencv_flann249d.dll b/bin/Win64/opencv_flann249d.dll deleted file mode 100644 index 52fb652..0000000 Binary files a/bin/Win64/opencv_flann249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_gpu249.dll b/bin/Win64/opencv_gpu249.dll deleted file mode 100644 index ac5476c..0000000 Binary files a/bin/Win64/opencv_gpu249.dll and /dev/null differ diff --git a/bin/Win64/opencv_gpu249d.dll b/bin/Win64/opencv_gpu249d.dll deleted file mode 100644 index d22b84e..0000000 Binary files a/bin/Win64/opencv_gpu249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_highgui249.dll b/bin/Win64/opencv_highgui249.dll deleted file mode 100644 index aeb65fb..0000000 Binary files a/bin/Win64/opencv_highgui249.dll and /dev/null differ diff --git a/bin/Win64/opencv_highgui249d.dll b/bin/Win64/opencv_highgui249d.dll deleted file mode 100644 index 79d10ba..0000000 Binary files a/bin/Win64/opencv_highgui249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_imgproc249.dll b/bin/Win64/opencv_imgproc249.dll deleted file mode 100644 index 0d0968d..0000000 Binary files a/bin/Win64/opencv_imgproc249.dll and /dev/null differ diff --git a/bin/Win64/opencv_imgproc249d.dll b/bin/Win64/opencv_imgproc249d.dll deleted file mode 100644 index 47db25d..0000000 Binary files a/bin/Win64/opencv_imgproc249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_legacy249.dll b/bin/Win64/opencv_legacy249.dll deleted file mode 100644 index 7fc36c8..0000000 Binary files a/bin/Win64/opencv_legacy249.dll and /dev/null differ diff --git a/bin/Win64/opencv_legacy249d.dll b/bin/Win64/opencv_legacy249d.dll deleted file mode 100644 index 8ae2419..0000000 Binary files a/bin/Win64/opencv_legacy249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_ml249.dll b/bin/Win64/opencv_ml249.dll deleted file mode 100644 index 80aecbc..0000000 Binary files a/bin/Win64/opencv_ml249.dll and /dev/null differ diff --git a/bin/Win64/opencv_ml249d.dll b/bin/Win64/opencv_ml249d.dll deleted file mode 100644 index fbe1366..0000000 Binary files a/bin/Win64/opencv_ml249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_nonfree249.dll b/bin/Win64/opencv_nonfree249.dll deleted file mode 100644 index c45c7a1..0000000 Binary files a/bin/Win64/opencv_nonfree249.dll and /dev/null differ diff --git a/bin/Win64/opencv_nonfree249d.dll b/bin/Win64/opencv_nonfree249d.dll deleted file mode 100644 index 8d809f6..0000000 Binary files a/bin/Win64/opencv_nonfree249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_objdetect249.dll b/bin/Win64/opencv_objdetect249.dll deleted file mode 100644 index c4646df..0000000 Binary files a/bin/Win64/opencv_objdetect249.dll and /dev/null differ diff --git a/bin/Win64/opencv_objdetect249d.dll b/bin/Win64/opencv_objdetect249d.dll deleted file mode 100644 index ac99a18..0000000 Binary files a/bin/Win64/opencv_objdetect249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_ocl249.dll b/bin/Win64/opencv_ocl249.dll deleted file mode 100644 index 37adce3..0000000 Binary files a/bin/Win64/opencv_ocl249.dll and /dev/null differ diff --git a/bin/Win64/opencv_ocl249d.dll b/bin/Win64/opencv_ocl249d.dll deleted file mode 100644 index 92a23cb..0000000 Binary files a/bin/Win64/opencv_ocl249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_photo249.dll b/bin/Win64/opencv_photo249.dll deleted file mode 100644 index 98fc14d..0000000 Binary files a/bin/Win64/opencv_photo249.dll and /dev/null differ diff --git a/bin/Win64/opencv_photo249d.dll b/bin/Win64/opencv_photo249d.dll deleted file mode 100644 index 6162b9c..0000000 Binary files a/bin/Win64/opencv_photo249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_stitching249.dll b/bin/Win64/opencv_stitching249.dll deleted file mode 100644 index a10956f..0000000 Binary files a/bin/Win64/opencv_stitching249.dll and /dev/null differ diff --git a/bin/Win64/opencv_stitching249d.dll b/bin/Win64/opencv_stitching249d.dll deleted file mode 100644 index 194fa26..0000000 Binary files a/bin/Win64/opencv_stitching249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_superres249.dll b/bin/Win64/opencv_superres249.dll deleted file mode 100644 index 6a6449a..0000000 Binary files a/bin/Win64/opencv_superres249.dll and /dev/null differ diff --git a/bin/Win64/opencv_superres249d.dll b/bin/Win64/opencv_superres249d.dll deleted file mode 100644 index 4a3bde2..0000000 Binary files a/bin/Win64/opencv_superres249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_video249.dll b/bin/Win64/opencv_video249.dll deleted file mode 100644 index eb50f0d..0000000 Binary files a/bin/Win64/opencv_video249.dll and /dev/null differ diff --git a/bin/Win64/opencv_video249d.dll b/bin/Win64/opencv_video249d.dll deleted file mode 100644 index b2ba476..0000000 Binary files a/bin/Win64/opencv_video249d.dll and /dev/null differ diff --git a/bin/Win64/opencv_videostab249.dll b/bin/Win64/opencv_videostab249.dll deleted file mode 100644 index 7383327..0000000 Binary files a/bin/Win64/opencv_videostab249.dll and /dev/null differ diff --git a/bin/Win64/opencv_videostab249d.dll b/bin/Win64/opencv_videostab249d.dll deleted file mode 100644 index 1acc139..0000000 Binary files a/bin/Win64/opencv_videostab249d.dll and /dev/null differ diff --git a/bin/Win64/postproc-53.dll b/bin/Win64/postproc-53.dll deleted file mode 100644 index e09c69f..0000000 Binary files a/bin/Win64/postproc-53.dll and /dev/null differ diff --git a/bin/Win64/swresample-1.dll b/bin/Win64/swresample-1.dll deleted file mode 100644 index 9f710fd..0000000 Binary files a/bin/Win64/swresample-1.dll and /dev/null differ diff --git a/bin/Win64/swscale-3.dll b/bin/Win64/swscale-3.dll deleted file mode 100644 index 6badc79..0000000 Binary files a/bin/Win64/swscale-3.dll and /dev/null differ