From b61453a76221397572a508598cb987e0384e1b15 Mon Sep 17 00:00:00 2001
From: Florent Berthaut <florent.berthaut@univ-lille.fr>
Date: Sat, 3 May 2025 15:25:50 +0200
Subject: [PATCH] Update opencv

---
 src/modules/DepthCamModule.cpp | 9 ++++++---
 src/utils/create_marker.cpp    | 6 +++---
 wscript                        | 3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/modules/DepthCamModule.cpp b/src/modules/DepthCamModule.cpp
index b7a80f1..4adda46 100644
--- a/src/modules/DepthCamModule.cpp
+++ b/src/modules/DepthCamModule.cpp
@@ -1046,8 +1046,10 @@ void DepthCamModule::calibrate() {
         //find marker
         vector<vector<cv::Point2f> > corners;
         vector<int> ids;
+        cv::aruco::Dictionary dico 
+            = cv::aruco::getPredefinedDictionary(cv::aruco::DICT_ARUCO_ORIGINAL);
         cv::aruco::detectMarkers(kinectRgbImg, 
-                cv::aruco::getPredefinedDictionary(cv::aruco::DICT_ARUCO_ORIGINAL),
+                &dico,
                 corners,
                 ids);
         cv::aruco::drawDetectedMarkers(kinectRgbImg, corners);
@@ -1651,9 +1653,10 @@ void ArucoTracker::init() {
 void ArucoTracker::track(cv::Mat& img,
         std::vector<std::vector<cv::Point2f> >& corners, 
         std::vector<int>& ids) {
+    cv::aruco::Dictionary dico = cv::aruco::getPredefinedDictionary(
+                cv::aruco::DICT_ARUCO_ORIGINAL);
     cv::aruco::detectMarkers(img, 
-            cv::aruco::getPredefinedDictionary(
-                cv::aruco::DICT_ARUCO_ORIGINAL),
+            &dico,
             corners,
             ids);
 
diff --git a/src/utils/create_marker.cpp b/src/utils/create_marker.cpp
index 4053742..c93e735 100644
--- a/src/utils/create_marker.cpp
+++ b/src/utils/create_marker.cpp
@@ -79,11 +79,11 @@ int main(int argc, char *argv[]) {
         return 0;
     }
 
-    Ptr<aruco::Dictionary> dictionary =
-        aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY_NAME(dictionaryId));
+    aruco::Dictionary dictionary =
+        aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
 
     Mat markerImg;
-    aruco::drawMarker(dictionary, markerId, markerSize, markerImg, borderBits);
+    aruco::generateImageMarker(dictionary, markerId, markerSize, markerImg, borderBits);
 
     if(showImage) {
         imshow("marker", markerImg);
diff --git a/wscript b/wscript
index 7363cc0..9e20023 100755
--- a/wscript
+++ b/wscript
@@ -48,7 +48,7 @@ def configure(conf):
 				'CoreFoundation']
 		conf.env.DEFINES_OS  = ['OSX=1', 'POSIX=1']
 	elif sys.platform == 'win32' or sys.platform == 'cygwin':
-		conf.env.INCLUDES_OS = ['os/win/include/', 'C:\MinGW\include']
+		conf.env.INCLUDES_OS = ['os/win/include/', 'C:/MinGW/include']
 		conf.env.LIBPATH_OS = [os.path.join(os.getcwd(), 'os/win/lib/')]
 		conf.env.LIB_OS = ['m', 'pthreadGC1',
 				'ws2_32', 'xml2', 'GLU', 'GL',
@@ -71,6 +71,7 @@ def configure(conf):
 				'opencv_calib3d', 'opencv_imgproc', 
 				'opencv_imgcodecs', 'opencv_videoio', 
 				'opencv_aruco', 'opencv_features2d',
+				'opencv_objdetect', 
 				'assimp', 'rtaudio']
 		conf.env.LIBPATH_OS = ['/usr/local/lib/']
 		conf.env.DEFINES_OS  = ['POSIX=1','GL43=1', 'LINUX=1']
-- 
GitLab