Merge pull request #597 from asenyaev/asen/3.4.17_release

Updated submodules to 3.4.17 release
opencv · Dec 27, 2021 · dd73e24 · dd73e24
2 parents b5d6a85 + e881104
commit dd73e24
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/opencv b/opencv
diff --git a/opencv_contrib b/opencv_contrib
diff --git a/opencv_extra b/opencv_extra
diff --git a/setup.py b/setup.py
@@ -148,6 +148,7 @@ def main():
             "-DBUILD_PERF_TESTS=OFF",
             "-DBUILD_DOCS=OFF",
             "-DPYTHON3_LIMITED_API=ON",
+            "-DBUILD_OPENEXR=ON",
         ]
         + (
             # If it is not defined 'linker flags: /machine:X86' on Windows x64
+29 −0		modules/aruco/CMakeLists.txt
+1 −1		modules/aruco/include/opencv2/aruco.hpp
+10 −0		modules/aruco/include/opencv2/aruco/dictionary.hpp
+48 −0		modules/aruco/samples/aruco_samples_utility.hpp
+22 −78		modules/aruco/samples/calibrate_camera.cpp
+22 −79		modules/aruco/samples/calibrate_camera_charuco.cpp
+22 −3		modules/aruco/samples/create_board.cpp
+23 −3		modules/aruco/samples/create_board_charuco.cpp
+23 −3		modules/aruco/samples/create_marker.cpp
+26 −50		modules/aruco/samples/detect_board.cpp
+23 −49		modules/aruco/samples/detect_board_charuco.cpp
+29 −48		modules/aruco/samples/detect_diamonds.cpp
+26 −52		modules/aruco/samples/detect_markers.cpp
+0 −1		modules/aruco/samples/detector_params.yml
+21 −0		modules/aruco/samples/tutorial_camera_charuco.yml
+14 −0		modules/aruco/samples/tutorial_camera_params.yml
+5 −19		modules/aruco/samples/tutorial_charuco_create_detect.cpp
+38 −0		modules/aruco/samples/tutorial_dict.yml
+42 −0		modules/aruco/src/aruco.cpp
+30 −0		modules/aruco/src/dictionary.cpp
+91 −1		modules/aruco/test/test_arucodetection.cpp
+116 −0		modules/aruco/test/test_charucodetection.cpp
+3 −1		modules/aruco/test/test_main.cpp
+21 −9		modules/aruco/tutorials/aruco_board_detection/aruco_board_detection.markdown
+9 −4		modules/aruco/tutorials/aruco_calibration/aruco_calibration.markdown
+ −		modules/aruco/tutorials/aruco_calibration/images/img_00.jpg
+ −		modules/aruco/tutorials/aruco_calibration/images/img_01.jpg
+ −		modules/aruco/tutorials/aruco_calibration/images/img_02.jpg
+ −		modules/aruco/tutorials/aruco_calibration/images/img_03.jpg
+23 −11		modules/aruco/tutorials/aruco_detection/aruco_detection.markdown
+2 −0		modules/aruco/tutorials/aruco_faq/aruco_faq.markdown
+17 −13		modules/aruco/tutorials/charuco_detection/charuco_detection.markdown
+ −		modules/aruco/tutorials/charuco_detection/images/chaxis.jpg
+ −		modules/aruco/tutorials/charuco_detection/images/chaxis.png
+ −		modules/aruco/tutorials/charuco_detection/images/chcorners.jpg
+ −		modules/aruco/tutorials/charuco_detection/images/chcorners.png
+ −		modules/aruco/tutorials/charuco_detection/images/chocclusion.jpg
+ −		modules/aruco/tutorials/charuco_detection/images/chocclusion.png
+ −		modules/aruco/tutorials/charuco_detection/images/chocclusion_original.jpg
+ −		modules/aruco/tutorials/charuco_detection/images/choriginal.jpg
+ −		modules/aruco/tutorials/charuco_detection/images/choriginal.png
+13 −5		modules/aruco/tutorials/charuco_diamond_detection/charuco_diamond_detection.markdown
+1 −1		modules/cvv/CMakeLists.txt
+1 −1		modules/img_hash/src/radial_variance_hash.cpp
+5 −0		modules/sfm/CMakeLists.txt
+8 −8		modules/ximgproc/include/opencv2/ximgproc/structured_edge_detection.hpp
+36 −22		modules/ximgproc/samples/structured_edge_detection.cpp
+2 −1		modules/ximgproc/test/test_fld.cpp
+11 −30		modules/ximgproc/tutorials/prediction.markdown