Skip to content

Commit 97137ec

Browse files
authored
Merge pull request #3401 from stopmosk:move-aruco-tutorial
Move Aruco tutorials and samples to main repo #3401 merge with opencv/opencv#23018 merge with merge with opencv/opencv_extra#1143 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
1 parent 834a98c commit 97137ec

24 files changed

+10
-1472
lines changed

modules/aruco/CMakeLists.txt

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,2 @@
11
set(the_description "ArUco Marker Detection")
22
ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d opencv_objdetect WRAP python java objc js)
3-
ocv_include_directories(${CMAKE_CURRENT_BINARY_DIR})
4-
5-
ocv_add_testdata(samples/ contrib/aruco
6-
FILES_MATCHING PATTERN "*yml"
7-
)
8-
9-
ocv_add_testdata(tutorials/aruco_detection/images/ contrib/aruco
10-
FILES_MATCHING PATTERN "singlemarkersoriginal.jpg"
11-
)
12-
13-
ocv_add_testdata(tutorials/aruco_board_detection/images/ contrib/aruco
14-
FILES_MATCHING PATTERN "gboriginal.png"
15-
)
16-
17-
ocv_add_testdata(tutorials/charuco_detection/images/ contrib/aruco
18-
FILES_MATCHING PATTERN "choriginal.jpg"
19-
)
20-
21-
ocv_add_testdata(tutorials/charuco_detection/images/ contrib/aruco
22-
FILES_MATCHING PATTERN "chocclusion_original.jpg"
23-
)
24-
25-
ocv_add_testdata(tutorials/charuco_diamond_detection/images/ contrib/aruco
26-
FILES_MATCHING PATTERN "diamondmarkers.png"
27-
)
28-
29-
ocv_add_testdata(tutorials/aruco_calibration/images/ contrib/aruco
30-
FILES_MATCHING REGEX "img_[0-9]+.jpg"
31-
)

modules/aruco/samples/create_marker.cpp

Lines changed: 0 additions & 116 deletions
This file was deleted.

modules/aruco/samples/detect_markers.cpp

Lines changed: 0 additions & 208 deletions
This file was deleted.

0 commit comments

Comments
 (0)