Update to OpenCV 4.9.0.

Author: smbape

README.md

@@ -45,8 +45,8 @@ In fact, the dll being a [Component Object Model (COM)](https://docs.microsoft.c
 
 ## Prerequisites
 
-  - Download and extract [opencv-4.8.0-windows.exe](https://opencv.org/releases/) into a folder
-  - Download and extract [autoit-opencv-4.8.0-com-v2.5.0.7z](https://github.com/smbape/node-autoit-opencv-com/releases/download/v2.5.0/autoit-opencv-4.8.0-com-v2.5.0.7z) into a folder
+  - Download and extract [opencv-4.9.0-windows.exe](https://opencv.org/releases/) into a folder
+  - Download and extract [autoit-opencv-4.9.0-com-v2.5.0.7z](https://github.com/smbape/node-autoit-opencv-com/releases/download/v2.5.0/autoit-opencv-4.9.0-com-v2.5.0.7z) into a folder
 
 ## Usage
 
@@ -62,7 +62,7 @@ In fact, the dll being a [Component Object Model (COM)](https://docs.microsoft.c
 
 #include "autoit-opencv-com\udf\opencv_udf_utils.au3"
 
-_OpenCV_Open("opencv-4.8.0-windows\opencv\build\x64\vc16\bin\opencv_world480.dll", "autoit-opencv-com\autoit_opencv_com480.dll")
+_OpenCV_Open("opencv-4.9.0-windows\opencv\build\x64\vc16\bin\opencv_world490.dll", "autoit-opencv-com\autoit_opencv_com490.dll")
 OnAutoItExitRegister("_OnAutoItExit")
 Example()
 
@@ -92,7 +92,7 @@ EndFunc   ;==>_OnAutoItExit
 #include "autoit-opencv-com\udf\opencv_udf_utils.au3"
 #include <GUIConstantsEx.au3>
 
-_OpenCV_Open("opencv-4.8.0-windows\opencv\build\x64\vc16\bin\opencv_world480.dll", "autoit-opencv-com\autoit_opencv_com480.dll")
+_OpenCV_Open("opencv-4.9.0-windows\opencv\build\x64\vc16\bin\opencv_world490.dll", "autoit-opencv-com\autoit_opencv_com490.dll")
 OnAutoItExitRegister("_OnAutoItExit")
 Example()
 
@@ -144,7 +144,7 @@ function Example() {
     $cv.destroyAllWindows()
 }
 
-[OpenCvComInterop]::DllOpen("opencv-4.8.0-windows\opencv\build\x64\vc16\bin\opencv_world480.dll", "autoit-opencv-com\autoit_opencv_com480.dll")
+[OpenCvComInterop]::DllOpen("opencv-4.9.0-windows\opencv\build\x64\vc16\bin\opencv_world490.dll", "autoit-opencv-com\autoit_opencv_com490.dll")
 
 Example
 
@@ -184,8 +184,8 @@ public static class Test
     static void Main(String[] args)
     {
         OpenCvComInterop.DllOpen(
-            "opencv-4.8.0-windows\\opencv\\build\\x64\\vc16\\bin\\opencv_world480.dll",
-            "autoit-opencv-com\\autoit_opencv_com480.dll"
+            "opencv-4.9.0-windows\\opencv\\build\\x64\\vc16\\bin\\opencv_world490.dll",
+            "autoit-opencv-com\\autoit_opencv_com490.dll"
         );
 
         Example();
@@ -219,8 +219,8 @@ public static class Test
     static void Main(String[] args)
     {
         OpenCvComInterop.DllOpen(
-            "opencv-4.8.0-windows\\opencv\\build\\x64\\vc16\\bin\\opencv_world480.dll",
-            "autoit-opencv-com\\autoit_opencv_com480.dll"
+            "opencv-4.9.0-windows\\opencv\\build\\x64\\vc16\\bin\\opencv_world490.dll",
+            "autoit-opencv-com\\autoit_opencv_com490.dll"
         );
 
         // Enable Registration-Free COM
@@ -248,23 +248,23 @@ Then, in [Git Bash](https://gitforwindows.org/), execute the following commands
 # go to the folder of your choice
 # cd ...
 
-# download autoit-opencv-4.8.0-com-v2.5.0.7z
-curl -L 'https://github.com/smbape/node-autoit-opencv-com/releases/download/v2.5.0/autoit-opencv-4.8.0-com-v2.5.0.7z' -o autoit-opencv-4.8.0-com-v2.5.0.7z
+# download autoit-opencv-4.9.0-com-v2.5.0.7z
+curl -L 'https://github.com/smbape/node-autoit-opencv-com/releases/download/v2.5.0/autoit-opencv-4.9.0-com-v2.5.0.7z' -o autoit-opencv-4.9.0-com-v2.5.0.7z
 
-# extract the content of autoit-opencv-4.8.0-com-v2.5.0.7z into a folder named autoit-opencv-com
-7z x autoit-opencv-4.8.0-com-v2.5.0.7z -aoa -oautoit-opencv-com
+# extract the content of autoit-opencv-4.9.0-com-v2.5.0.7z into a folder named autoit-opencv-com
+7z x autoit-opencv-4.9.0-com-v2.5.0.7z -aoa -oautoit-opencv-com
 
-# download opencv-4.8.0-windows.exe
-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
+# download opencv-4.9.0-windows.exe
+curl -L 'https://github.com/opencv/opencv/releases/download/4.9.0/opencv-4.9.0-windows.exe' -o opencv-4.9.0-windows.exe
 
-# extract the content of opencv-4.8.0-windows.exe into a folder named opencv-4.8.0-windows
-./opencv-4.8.0-windows.exe -oopencv-4.8.0-windows -y
+# extract the content of opencv-4.9.0-windows.exe into a folder named opencv-4.9.0-windows
+./opencv-4.9.0-windows.exe -oopencv-4.9.0-windows -y
 
-# download autoit-opencv-4.8.0-com-v2.5.0-src.zip
-curl -L 'https://github.com/smbape/node-autoit-opencv-com/archive/refs/tags/v2.5.0.zip' -o autoit-opencv-4.8.0-com-v2.5.0-src.zip
+# download autoit-opencv-4.9.0-com-v2.5.0-src.zip
+curl -L 'https://github.com/smbape/node-autoit-opencv-com/archive/refs/tags/v2.5.0.zip' -o autoit-opencv-4.9.0-com-v2.5.0-src.zip
 
-# extract the autoit-addon and samples folders of autoit-opencv-4.8.0-com-v2.5.0-src.zip
-7z x autoit-opencv-4.8.0-com-v2.5.0-src.zip -aoa 'node-autoit-opencv-com-2.5.0\autoit-addon\*' 'node-autoit-opencv-com-2.5.0\samples\*'
+# extract the autoit-addon and samples folders of autoit-opencv-4.9.0-com-v2.5.0-src.zip
+7z x autoit-opencv-4.9.0-com-v2.5.0-src.zip -aoa 'node-autoit-opencv-com-2.5.0\autoit-addon\*' 'node-autoit-opencv-com-2.5.0\samples\*'
 cp -rf node-autoit-opencv-com-2.5.0/* ./
 rm -rf node-autoit-opencv-com-2.5.0
 ```
@@ -314,7 +314,7 @@ The transformation will usually be straight from python.
 The translation usually involves 2 steps:
 
   - Finding the functions/constants names.
-  - 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).
+  - Transform the parameter types according to the UDF parameter. This step might involve looking at the [opencv documentation](https://docs.opencv.org/4.9.0/index.html).
 
 ### Finding the functions/constants names
 
@@ -357,7 +357,7 @@ cnts, _ = cv2.findContours(thresh_img, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPL
 blurred = cv2.GaussianBlur(image, (3, 3), 0)
 ```
 
-The [GaussianBlur](https://docs.opencv.org/4.8.0/d4/d86/group__imgproc__filter.html#gaabe8c836e97159a9193fb0b11ac52cf1) documentation gives the following information
+The [GaussianBlur](https://docs.opencv.org/4.9.0/d4/d86/group__imgproc__filter.html#gaabe8c836e97159a9193fb0b11ac52cf1) documentation gives the following information
 ```txt
 void cv::GaussianBlur   (   InputArray    src,
     OutputArray   dst,
@@ -390,7 +390,7 @@ $blurred = $cv.GaussianBlur($image, _OpenCV_Size(3, 3), 0)
 T, thresh_img = cv2.threshold(blurred, 215, 255, cv2.THRESH_BINARY)
 ```
 
-The [threshold](https://docs.opencv.org/4.8.0/d7/d1b/group__imgproc__misc.html#gae8a4a146d1ca78c626a53577199e9c57) documentation gives the following information
+The [threshold](https://docs.opencv.org/4.9.0/d7/d1b/group__imgproc__misc.html#gae8a4a146d1ca78c626a53577199e9c57) documentation gives the following information
 ```txt
 double cv::threshold  (   InputArray    src,
     OutputArray   dst,
@@ -434,7 +434,7 @@ $thresh_img = $cv.extended[1]
 cnts, _ = cv2.findContours(thresh_img, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
 ```
 
-The [findContours](https://docs.opencv.org/4.8.0/d3/dc0/group__imgproc__shape.html#gadf1ad6a0b82947fa1fe3c3d497f260e0) documentation gives the following information
+The [findContours](https://docs.opencv.org/4.9.0/d3/dc0/group__imgproc__shape.html#gadf1ad6a0b82947fa1fe3c3d497f260e0) documentation gives the following information
 ```txt
 void cv::findContours   (   InputArray    image,
     OutputArrayOfArrays   contours,

autoit-addon/CMakeLists.txt

@@ -12,7 +12,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
-set(OpenCV_VERSION 4.8.0 CACHE STRING "Choose the OpenCV version.")
+set(OpenCV_VERSION 4.9.0 CACHE STRING "Choose the OpenCV version.")
 file(CREATE_LINK "${CMAKE_CURRENT_SOURCE_DIR}/../autoit-opencv-com/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake" SYMBOLIC)
 file(CREATE_LINK "${CMAKE_CURRENT_SOURCE_DIR}/../autoit-opencv-com/patches" "${CMAKE_CURRENT_SOURCE_DIR}/patches" SYMBOLIC)
 include(cmake/RequireOpenCV.cmake)

autoit-addon/addon.au3

@@ -14,7 +14,7 @@ Func _Addon_DLLClose()
 EndFunc   ;==>_Addon_DLLClose
 
 Func _Addon_FindDLL($sFile = Default, $sFilter = Default, $sDir = Default, $bReverse = Default)
-	If $sFile == Default Then $sFile = "autoit_addon480*"
+	If $sFile == Default Then $sFile = "autoit_addon490*"
 	Local $_cv_build_type = EnvGet("OPENCV_BUILD_TYPE")
 	Local $sBuildType = $_cv_build_type == "Debug" ? "Debug" : "Release"
 	Local $sPostfix = $_cv_build_type == "Debug" ? "d" : ""

autoit-addon/addon.cpp

@@ -190,11 +190,11 @@ void object_detection_postprocess(
 	const int inpHeight,
 	const float imgScale,
 	const size_t num_classes,
+	const int background_label_id,
 	const float confidence_threshold,
-	const float score_threshold,
 	const std::vector<cv::Mat>& outs,
 	std::vector<int>& class_ids,
-	std::vector<float>& scores,
+	std::vector<float>& confidences,
 	std::vector<cv::Rect2d>& bboxes
 )
 {
@@ -204,8 +204,6 @@ void object_detection_postprocess(
 	auto outLayerType = lastLayer->type;
 
 	Mat classes_scores(1, 0, CV_32FC1);
-	Point maxClassLoc;
-	double maxScore;
 	float scale_x, scale_y;
 
 	if (outLayerType == "DetectionOutput")
@@ -244,14 +242,20 @@ void object_detection_postprocess(
 				double width = (double)data[i + 5] * scale_x - left + 1;
 				double height = (double)data[i + 6] * scale_y - top + 1;
 
-				class_ids.push_back((int)(data[i + 1]));
+				int class_id = (int)(data[i + 1]);
+				if (background_label_id >= 0 && background_label_id <= class_id) {
+					class_id--; // Skip the background class id.
+				}
+				class_ids.push_back(class_id);
+				confidences.push_back(confidence);
 				bboxes.push_back(Rect2d(left, top, width, height));
-				scores.push_back(confidence);
 			}
 		}
 	}
 	else if (outLayerType == "Region")
 	{
+		// yolo v4
+
 		// relative coordinates
 		scale_x = inpWidth * imgScale;
 		scale_y = inpHeight * imgScale;
@@ -266,15 +270,13 @@ void object_detection_postprocess(
 
 			for (int j = 0; j < out.rows; ++j, data += out.cols)
 			{
-				if (data[4] < confidence_threshold) {
-					continue;
-				}
-
 				classes_scores.data = reinterpret_cast<uchar*>(data + 5);
 
 				// Get the value and location of the maximum score
-				minMaxLoc(classes_scores, 0, &maxScore, 0, &maxClassLoc);
-				if (maxScore <= score_threshold) {
+				double confidence;
+				Point maxClassLoc;
+				minMaxLoc(classes_scores, 0, &confidence, 0, &maxClassLoc);
+				if (confidence <= confidence_threshold) {
 					continue;
 				}
 
@@ -285,9 +287,9 @@ void object_detection_postprocess(
 				double left = centerX - width / 2;
 				double top = centerY - height / 2;
 
-				bboxes.push_back(Rect2d(left, top, width, height));
-				scores.push_back((float)maxScore);
 				class_ids.push_back(maxClassLoc.x);
+				confidences.push_back((float)confidence);
+				bboxes.push_back(Rect2d(left, top, width, height));
 			}
 		}
 	}
@@ -353,9 +355,11 @@ void object_detection_postprocess(
 				classes_scores.data = reinterpret_cast<uchar*>(data + offset);
 
 				// Get the value and location of the maximum score
-				minMaxLoc(classes_scores, 0, &maxScore, 0, &maxClassLoc);
+				double confidence;
+				Point maxClassLoc;
+				minMaxLoc(classes_scores, 0, &confidence, 0, &maxClassLoc);
 
-				if (maxScore >= score_threshold)
+				if (confidence >= confidence_threshold)
 				{
 					double centerX = (double)data[0] * scale_x;
 					double centerY = (double)data[1] * scale_y;
@@ -364,9 +368,9 @@ void object_detection_postprocess(
 					double left = centerX - width / 2;
 					double top = centerY - height / 2;
 
-					bboxes.push_back(Rect2d(left, top, width, height));
-					scores.push_back((float)maxScore);
 					class_ids.push_back(maxClassLoc.x);
+					confidences.push_back((float)confidence);
+					bboxes.push_back(Rect2d(left, top, width, height));
 				}
 			}
 		}

autoit-addon/addon.h

@@ -57,11 +57,11 @@ AUTOITAPI(void) object_detection_postprocess(
 	const int inpHeight,
 	const float imgScale,
 	const size_t num_classes,
+	const int background_label_id,
 	const float confidence_threshold,
-	const float score_threshold,
 	const std::vector<cv::Mat>& outs,
 	std::vector<int>& class_ids,
-	std::vector<float>& scores,
+	std::vector<float>& confidences,
 	std::vector<cv::Rect2d>& bboxes
 );
 

autoit-opencv-com/CMakeLists.txt

@@ -27,8 +27,6 @@ include(cmake/vcpkg_regex_replace_string.cmake)
 
 # update version in files
 vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/src/cvLib.rc" "(opencv_world|autoit_opencv_com|opencv_videoio_ffmpeg)[0-9]+" "\\1${OpenCV_DLLVERSION}")
-vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../scripts/build.js" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+" "opencv-${OpenCV_VERSION}")
-vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../src/gen.js" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+" "opencv-${OpenCV_VERSION}")
 vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../README.md" "/opencv/releases/download/[0-9]+\\.[0-9]+\\.[0-9]+/" "/opencv/releases/download/${OpenCV_VERSION}/")
 vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../README.md" "\\\\\\\\x64\\\\\\\\vc[^\\\\]+\\\\\\\\bin" "\\\\\\\\${OpenCV_VC_PATH_ESC_ESC}\\\\\\\\bin")
 vcpkg_regex_replace_string("${CMAKE_CURRENT_SOURCE_DIR}/../autoit-addon/CMakeLists.txt" "OpenCV_VERSION [0-9]+\\.[0-9]+\\.[0-9]+" "OpenCV_VERSION ${OpenCV_VERSION}")
@@ -44,6 +42,9 @@ file(GLOB_RECURSE files_to_change
   ../samples/*.cs
   ../samples/*.ps1
   ../samples/*.psm1
+  ../samples/*.py
+  ../scripts/build.js
+  ../src/gen.js
 )
 
 foreach(item ${files_to_change})
@@ -53,6 +54,10 @@ foreach(item ${files_to_change})
   vcpkg_regex_replace_string("${item}" "opencv-[0-9]+\\.[0-9]+\\.[0-9]+" "opencv-${OpenCV_VERSION}")
   vcpkg_regex_replace_string("${item}" "(opencv_world|autoit_opencv_com|opencv_videoio_ffmpeg)[0-9]+" "\\1${OpenCV_DLLVERSION}")
   vcpkg_regex_replace_string("${item}" "\\\\x64\\\\vc[^\\\\]+\\\\bin" "\\\\${OpenCV_VC_PATH_ESC}\\\\bin")
+
+  if(item MATCHES "\\.js$")
+    configure_file(${item} ${item} @ONLY NEWLINE_STYLE LF)
+  endif()
 endforeach()
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications")

autoit-opencv-com/cmake/RequireOpenCV.cmake

@@ -96,7 +96,7 @@ list(GET OpenCV_VERSION_LIST 0 OpenCV_VERSION_MAJOR)
 list(GET OpenCV_VERSION_LIST 1 OpenCV_VERSION_MINOR)
 list(GET OpenCV_VERSION_LIST 2 OpenCV_VERSION_PATCH)
 
-set(OpenCV_DLLVERSION "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}" PARENT_SCOPE)
+set(OpenCV_DLLVERSION "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
 set(OpenCV_DEBUG_POSTFIX d)
 
 if(DEFINED CMAKE_DEBUG_POSTFIX)

autoit-opencv-com/dotnet/OpenCvComInterop.cs

@@ -92,7 +92,7 @@ public static void DllOpen(string openCvWorldDll, string openCvComDll)
         }
 
         var parts = openCvWorldDll.Split(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-        parts[parts.Length - 1] = "opencv_videoio_ffmpeg480_64.dll";
+        parts[parts.Length - 1] = "opencv_videoio_ffmpeg490_64.dll";
         var openCvFfmpegDll = string.Join(Path.DirectorySeparatorChar.ToString(), parts);
         hOpenCvFfmpeg = LoadLibrary(openCvFfmpegDll);
         if (hOpenCvFfmpeg == IntPtr.Zero)
@@ -459,8 +459,8 @@ public static string FindDLL(string path, string filter = null, string rootPath
             "autoit-opencv-com",
             "autoit-opencv-com\\build_x64\\bin\\" + buildType,
             "opencv\\build\\x64\\vc*\\bin",
-            "opencv-4.8.0-*\\build\\x64\\vc*\\bin",
-            "opencv-4.8.0-*\\opencv\\build\\x64\\vc*\\bin"
+            "opencv-4.9.0-*\\build\\x64\\vc*\\bin",
+            "opencv-4.9.0-*\\opencv\\build\\x64\\vc*\\bin"
         };
 
         return FindFile(path + postSuffix + ".dll", rootPath, filter, hints.ToArray());

autoit-opencv-com/install.bat

@@ -41,10 +41,10 @@
 
 :mainmenu
 @SET DLLDIRNAME=
-@SET DLLNAME=autoit_opencv_com480%DEBUG_PREFIX%.dll
+@SET DLLNAME=autoit_opencv_com490%DEBUG_PREFIX%.dll
 
 @IF EXIST "%CD%\build_x64\%INT_DIR%\%DLLNAME%" @SET "DLLDIRNAME=%CD%\build_x64\%INT_DIR%\"
-@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%"
+@IF EXIST "%CD%\..\opencv-4.9.0-windows\opencv\build\x64\vc16\bin" @SET "PATH=%CD%\..\opencv-4.9.0-windows\opencv\build\x64\vc16\bin;%PATH%"
 
 @SET DLLNAME=%DLLDIRNAME%%DLLNAME%
 

autoit-opencv-com/src/cvLib.rc

@@ -81,11 +81,11 @@ BEGIN
             VALUE "FileVersion", "2.5.0"
             // VALUE "LegalCopyright", "TODO: (c) <Nom de la société>.  Tous droits réservés."
 #ifdef _DEBUG
-            VALUE "InternalName", "autoit_opencv_com480d.dll"
-            VALUE "OriginalFilename", "autoit_opencv_com480d.dll"
+            VALUE "InternalName", "autoit_opencv_com490d.dll"
+            VALUE "OriginalFilename", "autoit_opencv_com490d.dll"
 #else
-            VALUE "InternalName", "autoit_opencv_com480.dll"
-            VALUE "OriginalFilename", "autoit_opencv_com480.dll"
+            VALUE "InternalName", "autoit_opencv_com490.dll"
+            VALUE "OriginalFilename", "autoit_opencv_com490.dll"
 #endif
             VALUE "ProductName", "AutoIt OpenCV COM"
             VALUE "ProductVersion", "2.5.0"