Skip to content

(5.x) Merge 4.x #3644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 27, 2024
Merged

(5.x) Merge 4.x #3644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5351397
fix:3639
harshitnagar22 Feb 19, 2024
d870648
Merge pull request #3640 from harshitnagar22:Fix#3639/-fix-typos
asmorkalov Feb 21, 2024
9bce8a9
Got rid of global mutex.
asmorkalov Feb 24, 2024
834a98c
Merge pull request #3643 from asmorkalov:as/macbeth_cleanup
asmorkalov Feb 25, 2024
97137ec
Merge pull request #3401 from stopmosk:move-aruco-tutorial
stopmosk Feb 26, 2024
c5d22dd
Merge branch 4.x
asmorkalov Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions modules/aruco/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,3 @@ set(the_description "ArUco Marker Detection")
ocv_define_module(aruco opencv_core opencv_imgproc opencv_3d opencv_calib opencv_objdetect WRAP python java objc js)
ocv_include_directories(${CMAKE_CURRENT_BINARY_DIR})

ocv_add_testdata(samples/ contrib/aruco
FILES_MATCHING PATTERN "*yml"
)

ocv_add_testdata(tutorials/aruco_detection/images/ contrib/aruco
FILES_MATCHING PATTERN "singlemarkersoriginal.jpg"
)

ocv_add_testdata(tutorials/aruco_board_detection/images/ contrib/aruco
FILES_MATCHING PATTERN "gboriginal.png"
)

ocv_add_testdata(tutorials/charuco_detection/images/ contrib/aruco
FILES_MATCHING PATTERN "choriginal.jpg"
)

ocv_add_testdata(tutorials/charuco_detection/images/ contrib/aruco
FILES_MATCHING PATTERN "chocclusion_original.jpg"
)

ocv_add_testdata(tutorials/charuco_diamond_detection/images/ contrib/aruco
FILES_MATCHING PATTERN "diamondmarkers.png"
)

ocv_add_testdata(tutorials/aruco_calibration/images/ contrib/aruco
FILES_MATCHING REGEX "img_[0-9]+.jpg"
)
116 changes: 0 additions & 116 deletions modules/aruco/samples/create_marker.cpp
View file
Open in desktop

This file was deleted.

208 changes: 0 additions & 208 deletions modules/aruco/samples/detect_markers.cpp
View file
Open in desktop

This file was deleted.

Loading