diff --git a/src/modules/DepthCamModule.cpp b/src/modules/DepthCamModule.cpp
index b7a80f137b7961fe008560f7d66757c4bbb9d762..4adda4666094ac34ca5a51c25722a17834f5319f 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 4053742744639fd80ce3213d63f9e3857c8e78b4..c93e7356d44385ac49ffc4a51556d24523867b6a 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 7363cc04c74d2c1aef365a98bdb6cc7139c2b4e7..9e200238323831f0a6a7dda596f3e00e5f5a0dda 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']