Skip to content

Commit d31fd5e

Browse files
committed
update opencv to 4.8.0
1 parent cfe8383 commit d31fd5e

File tree

84 files changed

+4309
-1148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+4309
-1148
lines changed

README.md

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,46 @@ In fact, the dll being a [Component Object Model (COM)](https://docs.microsoft.c
77

88
## Table Of Contents
99

10-
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
11-
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
12-
13-
14-
- [Prerequisites](#prerequisites)
15-
- [Usage](#usage)
16-
- [AutoIt](#autoit)
17-
- [PowerShell](#powershell)
18-
- [csharp](#csharp)
19-
- [Runtime example](#runtime-example)
20-
- [Compile time example](#compile-time-example)
21-
- [Running examples](#running-examples)
22-
- [Prerequisites](#prerequisites-1)
23-
- [autoit](#autoit)
24-
- [powershell](#powershell)
25-
- [csharp](#csharp-1)
26-
- [\[optional\] Build the addon dll](#%5Coptional%5C-build-the-addon-dll)
27-
- [Prerequisite](#prerequisite)
28-
- [Building](#building)
29-
- [How to translate python/c++ code to the UDF](#how-to-translate-pythonc-code-to-the-udf)
30-
- [Finding the functions/constants names](#finding-the-functionsconstants-names)
31-
- [Transform the parameter types](#transform-the-parameter-types)
32-
- [Python translation example](#python-translation-example)
33-
- [First line](#first-line)
34-
- [Second line](#second-line)
35-
- [Third line](#third-line)
36-
- [Final result](#final-result)
37-
- [Developpement](#developpement)
38-
- [Prerequisites](#prerequisites-2)
39-
- [Environment](#environment)
40-
- [Generate the UDF files](#generate-the-udf-files)
41-
- [Breaking changes from v1](#breaking-changes-from-v1)
42-
- [History](#history)
43-
44-
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
10+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
11+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
12+
13+
14+
- [Prerequisites](#prerequisites)
15+
- [Usage](#usage)
16+
- [AutoIt](#autoit)
17+
- [PowerShell](#powershell)
18+
- [csharp](#csharp)
19+
- [Runtime example](#runtime-example)
20+
- [Compile time example](#compile-time-example)
21+
- [Running examples](#running-examples)
22+
- [Prerequisites](#prerequisites-1)
23+
- [autoit](#autoit)
24+
- [powershell](#powershell)
25+
- [csharp](#csharp-1)
26+
- [\[optional\] Build the addon dll](#%5Coptional%5C-build-the-addon-dll)
27+
- [Prerequisite](#prerequisite)
28+
- [Building](#building)
29+
- [How to translate python/c++ code to the UDF](#how-to-translate-pythonc-code-to-the-udf)
30+
- [Finding the functions/constants names](#finding-the-functionsconstants-names)
31+
- [Transform the parameter types](#transform-the-parameter-types)
32+
- [Python translation example](#python-translation-example)
33+
- [First line](#first-line)
34+
- [Second line](#second-line)
35+
- [Third line](#third-line)
36+
- [Final result](#final-result)
37+
- [Developpement](#developpement)
38+
- [Prerequisites](#prerequisites-2)
39+
- [Environment](#environment)
40+
- [Generate the UDF files](#generate-the-udf-files)
41+
- [Breaking changes from v1](#breaking-changes-from-v1)
42+
- [History](#history)
43+
44+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
4545

4646
## Prerequisites
4747

48-
- Download and extract [opencv-4.7.0-windows.exe](https://opencv.org/releases/) into a folder
49-
- Download and extract [autoit-opencv-4.7.0-com-v2.4.1.7z](https://github.com/smbape/node-autoit-opencv-com/releases/download/v2.4.1/autoit-opencv-4.7.0-com-v2.4.1.7z) into a folder
48+
- Download and extract [opencv-4.8.0-windows.exe](https://opencv.org/releases/) into a folder
49+
- Download and extract [autoit-opencv-4.8.0-com-v2.4.1.7z](https://github.com/smbape/node-autoit-opencv-com/releases/download/v2.4.1/autoit-opencv-4.8.0-com-v2.4.1.7z) into a folder
5050

5151
## Usage
5252

@@ -62,7 +62,7 @@ In fact, the dll being a [Component Object Model (COM)](https://docs.microsoft.c
6262
6363
#include "autoit-opencv-com\udf\opencv_udf_utils.au3"
6464
65-
_OpenCV_Open("opencv-4.7.0-windows\opencv\build\x64\vc16\bin\opencv_world470.dll", "autoit-opencv-com\autoit_opencv_com470.dll")
65+
_OpenCV_Open("opencv-4.8.0-windows\opencv\build\x64\vc16\bin\opencv_world480.dll", "autoit-opencv-com\autoit_opencv_com480.dll")
6666
OnAutoItExitRegister("_OnAutoItExit")
6767
Example()
6868
@@ -92,7 +92,7 @@ EndFunc ;==>_OnAutoItExit
9292
#include "autoit-opencv-com\udf\opencv_udf_utils.au3"
9393
#include <GUIConstantsEx.au3>
9494
95-
_OpenCV_Open("opencv-4.7.0-windows\opencv\build\x64\vc16\bin\opencv_world470.dll", "autoit-opencv-com\autoit_opencv_com470.dll")
95+
_OpenCV_Open("opencv-4.8.0-windows\opencv\build\x64\vc16\bin\opencv_world480.dll", "autoit-opencv-com\autoit_opencv_com480.dll")
9696
OnAutoItExitRegister("_OnAutoItExit")
9797
Example()
9898
@@ -144,7 +144,7 @@ function Example() {
144144
$cv.destroyAllWindows()
145145
}
146146
147-
[OpenCvComInterop]::DllOpen("opencv-4.7.0-windows\opencv\build\x64\vc16\bin\opencv_world470.dll", "autoit-opencv-com\autoit_opencv_com470.dll")
147+
[OpenCvComInterop]::DllOpen("opencv-4.8.0-windows\opencv\build\x64\vc16\bin\opencv_world480.dll", "autoit-opencv-com\autoit_opencv_com480.dll")
148148
149149
Example
150150
@@ -184,8 +184,8 @@ public static class Test
184184
static void Main(String[] args)
185185
{
186186
OpenCvComInterop.DllOpen(
187-
"opencv-4.7.0-windows\\opencv\\build\\x64\\vc16\\bin\\opencv_world470.dll",
188-
"autoit-opencv-com\\autoit_opencv_com470.dll"
187+
"opencv-4.8.0-windows\\opencv\\build\\x64\\vc16\\bin\\opencv_world480.dll",
188+
"autoit-opencv-com\\autoit_opencv_com480.dll"
189189
);
190190

191191
Example();
@@ -219,8 +219,8 @@ public static class Test
219219
static void Main(String[] args)
220220
{
221221
OpenCvComInterop.DllOpen(
222-
"opencv-4.7.0-windows\\opencv\\build\\x64\\vc16\\bin\\opencv_world470.dll",
223-
"autoit-opencv-com\\autoit_opencv_com470.dll"
222+
"opencv-4.8.0-windows\\opencv\\build\\x64\\vc16\\bin\\opencv_world480.dll",
223+
"autoit-opencv-com\\autoit_opencv_com480.dll"
224224
);
225225

226226
// Enable Registration-Free COM
@@ -248,23 +248,23 @@ Then, in [Git Bash](https://gitforwindows.org/), execute the following commands
248248
# go to the folder of your choice
249249
# cd ...
250250

251-
# download autoit-opencv-4.7.0-com-v2.4.1.7z
252-
curl -L 'https://github.com/smbape/node-autoit-opencv-com/releases/download/v2.4.1/autoit-opencv-4.7.0-com-v2.4.1.7z' -o autoit-opencv-4.7.0-com-v2.4.1.7z
251+
# download autoit-opencv-4.8.0-com-v2.4.1.7z
252+
curl -L 'https://github.com/smbape/node-autoit-opencv-com/releases/download/v2.4.1/autoit-opencv-4.8.0-com-v2.4.1.7z' -o autoit-opencv-4.8.0-com-v2.4.1.7z
253253

254-
# extract the content of autoit-opencv-4.7.0-com-v2.4.1.7z into a folder named autoit-opencv-com
255-
7z x autoit-opencv-4.7.0-com-v2.4.1.7z -aoa -oautoit-opencv-com
254+
# extract the content of autoit-opencv-4.8.0-com-v2.4.1.7z into a folder named autoit-opencv-com
255+
7z x autoit-opencv-4.8.0-com-v2.4.1.7z -aoa -oautoit-opencv-com
256256

257-
# download opencv-4.7.0-windows.exe
258-
curl -L 'https://github.com/opencv/opencv/releases/download/4.7.0/opencv-4.7.0-windows.exe' -o opencv-4.7.0-windows.exe
257+
# download opencv-4.8.0-windows.exe
258+
curl -L 'https://github.com/opencv/opencv/releases/download/4.8.0/opencv-4.8.0-windows.exe' -o opencv-4.8.0-windows.exe
259259

260-
# extract the content of opencv-4.7.0-windows.exe into a folder named opencv-4.7.0-windows
261-
./opencv-4.7.0-windows.exe -oopencv-4.7.0-windows -y
260+
# extract the content of opencv-4.8.0-windows.exe into a folder named opencv-4.8.0-windows
261+
./opencv-4.8.0-windows.exe -oopencv-4.8.0-windows -y
262262

263-
# download autoit-opencv-4.7.0-com-v2.4.1-src.zip
264-
curl -L 'https://github.com/smbape/node-autoit-opencv-com/archive/refs/tags/v2.4.1.zip' -o autoit-opencv-4.7.0-com-v2.4.1-src.zip
263+
# download autoit-opencv-4.8.0-com-v2.4.1-src.zip
264+
curl -L 'https://github.com/smbape/node-autoit-opencv-com/archive/refs/tags/v2.4.1.zip' -o autoit-opencv-4.8.0-com-v2.4.1-src.zip
265265

266-
# extract the autoit-addon and samples folders of autoit-opencv-4.7.0-com-v2.4.1-src.zip
267-
7z x autoit-opencv-4.7.0-com-v2.4.1-src.zip -aoa 'node-autoit-opencv-com-2.4.1\autoit-addon\*' 'node-autoit-opencv-com-2.4.1\samples\*'
266+
# extract the autoit-addon and samples folders of autoit-opencv-4.8.0-com-v2.4.1-src.zip
267+
7z x autoit-opencv-4.8.0-com-v2.4.1-src.zip -aoa 'node-autoit-opencv-com-2.4.1\autoit-addon\*' 'node-autoit-opencv-com-2.4.1\samples\*'
268268
cp -rf node-autoit-opencv-com-2.4.1/* ./
269269
rm -rf node-autoit-opencv-com-2.4.1
270270
```
@@ -314,7 +314,7 @@ The transformation will usually be straight from python.
314314
The translation usually involves 2 steps:
315315

316316
- Finding the functions/constants names.
317-
- Transform the parameter types according to the UDF parameter. This step might involve looking at the [opencv documentation](https://docs.opencv.org/4.7.0/index.html).
317+
- Transform the parameter types according to the UDF parameter. This step might involve looking at the [opencv documentation](https://docs.opencv.org/4.8.0/index.html).
318318

319319
### Finding the functions/constants names
320320

@@ -357,7 +357,7 @@ cnts, _ = cv2.findContours(thresh_img, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPL
357357
blurred = cv2.GaussianBlur(image, (3, 3), 0)
358358
```
359359

360-
The [GaussianBlur](https://docs.opencv.org/4.7.0/d4/d86/group__imgproc__filter.html#gaabe8c836e97159a9193fb0b11ac52cf1) documentation gives the following information
360+
The [GaussianBlur](https://docs.opencv.org/4.8.0/d4/d86/group__imgproc__filter.html#gaabe8c836e97159a9193fb0b11ac52cf1) documentation gives the following information
361361
```txt
362362
void cv::GaussianBlur ( InputArray src,
363363
OutputArray dst,
@@ -390,7 +390,7 @@ $blurred = $cv.GaussianBlur($image, _OpenCV_Size(3, 3), 0)
390390
T, thresh_img = cv2.threshold(blurred, 215, 255, cv2.THRESH_BINARY)
391391
```
392392

393-
The [threshold](https://docs.opencv.org/4.7.0/d7/d1b/group__imgproc__misc.html#gae8a4a146d1ca78c626a53577199e9c57) documentation gives the following information
393+
The [threshold](https://docs.opencv.org/4.8.0/d7/d1b/group__imgproc__misc.html#gae8a4a146d1ca78c626a53577199e9c57) documentation gives the following information
394394
```txt
395395
double cv::threshold ( InputArray src,
396396
OutputArray dst,
@@ -434,7 +434,7 @@ $thresh_img = $cv.extended[1]
434434
cnts, _ = cv2.findContours(thresh_img, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
435435
```
436436

437-
The [findContours](https://docs.opencv.org/4.7.0/d3/dc0/group__imgproc__shape.html#gadf1ad6a0b82947fa1fe3c3d497f260e0) documentation gives the following information
437+
The [findContours](https://docs.opencv.org/4.8.0/d3/dc0/group__imgproc__shape.html#gadf1ad6a0b82947fa1fe3c3d497f260e0) documentation gives the following information
438438
```txt
439439
void cv::findContours ( InputArray image,
440440
OutputArrayOfArrays contours,

autoit-addon/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
1212
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
1313
endif()
1414

15-
set(OpenCV_VERSION 4.7.0 CACHE STRING "Choose the OpenCV version.")
15+
set(OpenCV_VERSION 4.8.0 CACHE STRING "Choose the OpenCV version.")
1616
file(CREATE_LINK "${CMAKE_CURRENT_SOURCE_DIR}/../autoit-opencv-com/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake" SYMBOLIC)
1717
file(CREATE_LINK "${CMAKE_CURRENT_SOURCE_DIR}/../autoit-opencv-com/patches" "${CMAKE_CURRENT_SOURCE_DIR}/patches" SYMBOLIC)
1818
include(cmake/RequireOpenCV.cmake)

autoit-addon/addon.au3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Func _Addon_DLLClose()
1414
EndFunc ;==>_Addon_DLLClose
1515

1616
Func _Addon_FindDLL($sFile = Default, $sFilter = Default, $sDir = Default, $bReverse = Default)
17-
If $sFile == Default Then $sFile = "autoit_addon470*"
17+
If $sFile == Default Then $sFile = "autoit_addon480*"
1818
Local $_cv_build_type = EnvGet("OPENCV_BUILD_TYPE")
1919
Local $sBuildType = $_cv_build_type == "Debug" ? "Debug" : "Release"
2020
Local $sPostfix = $_cv_build_type == "Debug" ? "d" : ""

autoit-opencv-com/CMakeLists.txt

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,41 +26,39 @@ include(cmake/RequireOpenCV.cmake)
2626
include(cmake/vcpkg_regex_replace_string.cmake)
2727

2828
# update version in files
29-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/install.bat" "(opencv_world|autoit_opencv_com|opencv_videoio_ffmpeg)[0-9]+" "\\1${OpenCV_DLLVERSION}")
30-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/install.bat" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+-(vc14_vc15|windows)\\.(exe|zip)" "${OpenCV_DOWNLOAD_NAME}")
31-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/install.bat" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+-(vc14_vc15|windows)" "${OpenCV_OUTPUT_DIR}")
32-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/install.bat" "\\\\x64\\\\vc[^\\\\]+\\\\bin" "\\\\${OpenCV_VC_PATH_ESC}\\\\bin")
33-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/install.bat" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+" "opencv-${OpenCV_VERSION}")
34-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/dotnet/OpenCvComInterop.cs" "(opencv_world|autoit_opencv_com|opencv_videoio_ffmpeg)[0-9]+" "opencv_videoio_ffmpeg${OpenCV_DLLVERSION}")
3529
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/src/cvLib.rc" "(opencv_world|autoit_opencv_com|opencv_videoio_ffmpeg)[0-9]+" "\\1${OpenCV_DLLVERSION}")
36-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/test/test.cpp" "(opencv_world|autoit_opencv_com|opencv_videoio_ffmpeg)[0-9]+" "\\1${OpenCV_DLLVERSION}")
37-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/test/test.cs" "(opencv_world|autoit_opencv_com|opencv_videoio_ffmpeg)[0-9]+" "\\1${OpenCV_DLLVERSION}")
38-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/udf/opencv_udf.au3" "(opencv_world|autoit_opencv_com|opencv_videoio_ffmpeg)[0-9]+" "\\1${OpenCV_DLLVERSION}")
39-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/udf/opencv_udf_utils.au3" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+" "opencv-${OpenCV_VERSION}")
4030
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../scripts/build.js" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+" "opencv-${OpenCV_VERSION}")
4131
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../src/gen.js" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+" "opencv-${OpenCV_VERSION}")
42-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../README.md" "(opencv_world|autoit_opencv_com|opencv_videoio_ffmpeg)[0-9]+" "\\1${OpenCV_DLLVERSION}")
43-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../README.md" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+-(vc14_vc15|windows)\\.(exe|zip)" "${OpenCV_DOWNLOAD_NAME}")
44-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../README.md" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+-(vc14_vc15|windows)" "${OpenCV_OUTPUT_DIR}")
45-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../README.md" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+" "opencv-${OpenCV_VERSION}")
4632
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../README.md" "/opencv/releases/download/[0-9]+\\.[0-9]+\\.[0-9]+/" "/opencv/releases/download/${OpenCV_VERSION}/")
47-
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../README.md" "\\\\x64\\\\vc[^\\\\]+\\\\bin" "\\\\${OpenCV_VC_PATH_ESC}\\\\bin")
4833
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../README.md" "\\\\\\\\x64\\\\\\\\vc[^\\\\]+\\\\\\\\bin" "\\\\\\\\${OpenCV_VC_PATH_ESC_ESC}\\\\\\\\bin")
4934
vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../autoit-addon/CMakeLists.txt" "OpenCV_VERSION [0-9]+\\.[0-9]+\\.[0-9]+" "OpenCV_VERSION ${OpenCV_VERSION}")
5035

51-
file(GLOB_RECURSE files_to_change "../samples/*.au3" "../samples/*.cs" "../samples/*.ps1")
36+
file(GLOB_RECURSE files_to_change
37+
"install.bat"
38+
"udf/*.au3"
39+
"dotnet/*.cs"
40+
"test/*.cpp"
41+
"test/*.cs"
42+
"../README.md"
43+
"../samples/*.au3"
44+
"../samples/*.cs"
45+
"../samples/*.ps1"
46+
"../samples/*.psm1"
47+
)
48+
5249
foreach(item ${files_to_change})
5350
vcpkg_regex_replace_string("${item}" "(https://docs\\.opencv\\.org/|https://github\\.com/opencv/opencv/blob/|opencv-)[0-9]+\\.[0-9]+\\.[0-9]+/" "\\1${OpenCV_VERSION}/")
5451
vcpkg_regex_replace_string("${item}" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+-(vc14_vc15|windows)\\.(exe|zip)" "${OpenCV_DOWNLOAD_NAME}")
5552
vcpkg_regex_replace_string("${item}" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+-(vc14_vc15|windows)" "${OpenCV_OUTPUT_DIR}")
53+
vcpkg_regex_replace_string("${item}" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+" "opencv-${OpenCV_VERSION}")
5654
vcpkg_regex_replace_string("${item}" "(opencv_world|autoit_opencv_com|opencv_videoio_ffmpeg)[0-9]+" "\\1${OpenCV_DLLVERSION}")
5755
vcpkg_regex_replace_string("${item}" "\\\\x64\\\\vc[^\\\\]+\\\\bin" "\\\\${OpenCV_VC_PATH_ESC}\\\\bin")
5856
endforeach()
5957

6058
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications")
6159
set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Output directory for libraries")
6260

63-
get_filename_component(OPENCV_SAMPLES_DATA_PATH "../samples/data" REALPATH)
61+
get_filename_component(OPENCV_SAMPLES_DATA_PATH "${opencv_SOURCE_DIR}/samples/data" REALPATH)
6462
file(TO_NATIVE_PATH "${OPENCV_SAMPLES_DATA_PATH}" OPENCV_SAMPLES_DATA_PATH)
6563

6664
# generate python headers

autoit-opencv-com/cmake/RequireOpenCV.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ include(cmake/FindPatch.cmake)
22

33
set(BUILD_opencv OFF CACHE BOOL "Build opencv from sources.")
44

5+
set(OpenCV_URL_HASH_480 1c8b1b78a51c46852eb5569d762bd11d0097a45c3db1f03eb41aba6f727b8942)
56
set(OpenCV_URL_HASH_470 7fab7be68a4ab7f1b70759b0e58d4c4ffc2b8aee72642df6f2dfcc6c161b2465)
67
set(OpenCV_URL_HASH_460 3fb046e14dc5b50719a86ea0395b5b1e3299e2343111ebd2e31828aa31d6d477)
78
set(OpenCV_URL_HASH_455 cac31973cd1c59bfe9dc926acbde815553d23662ea355e0414b5e50d8f8aa5a8)
@@ -12,9 +13,10 @@ set(OpenCV_URL_HASH_451 32132dd0bf38c62f73a2f20a0b19785282364f35e19c403f0767aa02
1213
set(OpenCV_URL_HASH_450 65c6b872cfcb1f55f8bedee8b64dc9c4c549035a566ac5ace622a4627c03bcf9)
1314

1415
set(OpenCV_DOWNLOAD_NAME_470 opencv-4.7.0-windows.exe)
16+
set(OpenCV_DOWNLOAD_NAME_480 opencv-4.8.0-windows.exe)
1517

16-
set(OpenCV_VERSION 4.7.0 CACHE STRING "Choose the OpenCV version.")
17-
set_property(CACHE OpenCV_VERSION PROPERTY STRINGS "4.7.0" "4.6.0" "4.5.5" "4.5.4" "4.5.3" "4.5.2" "4.5.1" "4.5.0")
18+
set(OpenCV_VERSION 4.8.0 CACHE STRING "Choose the OpenCV version.")
19+
set_property(CACHE OpenCV_VERSION PROPERTY STRINGS "4.8.0" "4.7.0" "4.6.0" "4.5.5" "4.5.4" "4.5.3" "4.5.2" "4.5.1" "4.5.0")
1820
string(REPLACE "." "" OpenCV_DLLVERSION ${OpenCV_VERSION})
1921

2022
if (DEFINED OpenCV_DOWNLOAD_NAME_${OpenCV_DLLVERSION})

autoit-opencv-com/dotnet/OpenCvComInterop.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public static void DllOpen(string openCvWorldDll, string openCvComDll)
9292
}
9393

9494
var parts = openCvWorldDll.Split(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
95-
parts[parts.Length - 1] = "opencv_videoio_ffmpeg470_64.dll";
95+
parts[parts.Length - 1] = "opencv_videoio_ffmpeg480_64.dll";
9696
var openCvFfmpegDll = string.Join(Path.DirectorySeparatorChar.ToString(), parts);
9797
hOpenCvFfmpeg = LoadLibrary(openCvFfmpegDll);
9898
if (hOpenCvFfmpeg == IntPtr.Zero)
@@ -459,8 +459,8 @@ public static string FindDLL(string path, string filter = null, string rootPath
459459
"autoit-opencv-com",
460460
"autoit-opencv-com\\build_x64\\bin\\" + buildType,
461461
"opencv\\build\\x64\\vc*\\bin",
462-
"opencv-4.7.0-*\\build\\x64\\vc*\\bin",
463-
"opencv-4.7.0-*\\opencv\\build\\x64\\vc*\\bin"
462+
"opencv-4.8.0-*\\build\\x64\\vc*\\bin",
463+
"opencv-4.8.0-*\\opencv\\build\\x64\\vc*\\bin"
464464
};
465465

466466
return FindFile(path + postSuffix + ".dll", rootPath, filter, hints.ToArray());

autoit-opencv-com/install.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141

4242
:mainmenu
4343
@SET DLLDIRNAME=
44-
@SET DLLNAME=autoit_opencv_com470%DEBUG_PREFIX%.dll
44+
@SET DLLNAME=autoit_opencv_com480%DEBUG_PREFIX%.dll
4545

4646
@IF EXIST "%CD%\build_x64\%INT_DIR%\%DLLNAME%" @SET "DLLDIRNAME=%CD%\build_x64\%INT_DIR%\"
47-
@IF EXIST "%CD%\..\opencv-4.7.0-windows\opencv\build\x64\vc16\bin" @SET "PATH=%CD%\..\opencv-4.7.0-windows\opencv\build\x64\vc16\bin;%PATH%"
47+
@IF EXIST "%CD%\..\opencv-4.8.0-windows\opencv\build\x64\vc16\bin" @SET "PATH=%CD%\..\opencv-4.8.0-windows\opencv\build\x64\vc16\bin;%PATH%"
4848

4949
@SET DLLNAME=%DLLDIRNAME%%DLLNAME%
5050

0 commit comments

Comments
 (0)