Skip to content

Update 3.4 branch for 3.4.18 release #671

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 2 commits into from
Jun 6, 2022
Merged

Update 3.4 branch for 3.4.18 release #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f965720
Removed unused lines
asenyaev Jun 5, 2022
6521b4b
Updated submodules to 3.4.18 release
asenyaev Jun 5, 2022
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
2 changes: 1 addition & 1 deletion opencv
Open in desktop
Submodule opencv updated 201 files
2 changes: 1 addition & 1 deletion opencv_contrib
Open in desktop
Submodule opencv_contrib updated 47 files
+16 −0 .github/workflows/PR-3.4.yaml
+79 −35 modules/aruco/include/opencv2/aruco.hpp
+4 −1 modules/aruco/include/opencv2/aruco/charuco.hpp
+28 −23 modules/aruco/include/opencv2/aruco/dictionary.hpp
+29 −0 modules/aruco/misc/python/test/test_aruco.py
+267 −0 modules/aruco/samples/aruco_dict_utils.cpp
+4 −4 modules/aruco/samples/calibrate_camera.cpp
+4 −4 modules/aruco/samples/calibrate_camera_charuco.cpp
+2 −2 modules/aruco/samples/create_board.cpp
+2 −2 modules/aruco/samples/create_board_charuco.cpp
+2 −2 modules/aruco/samples/create_marker.cpp
+5 −5 modules/aruco/samples/detect_board.cpp
+5 −5 modules/aruco/samples/detect_board_charuco.cpp
+6 −6 modules/aruco/samples/detect_diamonds.cpp
+5 −6 modules/aruco/samples/detect_markers.cpp
+1 −1 modules/aruco/samples/tutorial_charuco_create_detect.cpp
+1 −1 modules/aruco/src/apriltag_quad_thresh.cpp
+86 −117 modules/aruco/src/aruco.cpp
+14 −16 modules/aruco/src/charuco.cpp
+25 −7 modules/aruco/src/dictionary.cpp
+127 −0 modules/aruco/test/test_aruco_utils.hpp
+162 −2 modules/aruco/test/test_arucodetection.cpp
+22 −131 modules/aruco/test/test_boarddetection.cpp
+92 −125 modules/aruco/test/test_charucodetection.cpp
+5 −4 modules/aruco/tutorials/aruco_board_detection/aruco_board_detection.markdown
+ − modules/aruco/tutorials/aruco_board_detection/images/gbaxis.jpg
+ − modules/aruco/tutorials/aruco_board_detection/images/gbaxis.png
+ − modules/aruco/tutorials/aruco_board_detection/images/gbmarkersaxis.jpg
+ − modules/aruco/tutorials/aruco_board_detection/images/gbmarkersaxis.png
+ − modules/aruco/tutorials/aruco_board_detection/images/singlemarkersaxes.jpg
+ − modules/aruco/tutorials/aruco_board_detection/images/singlemarkersaxes2.jpg
+5 −4 modules/aruco/tutorials/aruco_detection/aruco_detection.markdown
+ − modules/aruco/tutorials/aruco_detection/images/singlemarkersaxes.jpg
+14 −2 modules/aruco/tutorials/aruco_faq/aruco_faq.markdown
+1 −1 modules/aruco/tutorials/charuco_detection/charuco_detection.markdown
+ − modules/aruco/tutorials/charuco_detection/images/chaxis.jpg
+3 −3 modules/aruco/tutorials/charuco_diamond_detection/charuco_diamond_detection.markdown
+ − modules/aruco/tutorials/charuco_diamond_detection/images/diamondsaxis.jpg
+ − modules/aruco/tutorials/charuco_diamond_detection/images/diamondsaxis.png
+5 −0 modules/line_descriptor/src/binary_descriptor.cpp
+2 −0 modules/sfm/CMakeLists.txt
+1 −1 modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt
+22 −0 modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc
+1 −1 modules/surface_matching/src/pose_3d.cpp
+41 −17 modules/ximgproc/include/opencv2/ximgproc/edge_drawing.hpp
+12 −6 modules/ximgproc/src/edge_drawing.cpp
+1 −1 modules/ximgproc/test/test_fld.cpp
2 changes: 1 addition & 1 deletion opencv_extra
Open in desktop
Submodule opencv_extra updated 21 files
+ − testdata/cv/aruco/recover.png
+ − testdata/cv/aruco/regression_2492.png
+ − testdata/cv/aruco/regression_3192.png
+ − testdata/cv/qrcode/issue_21287.png
+ − testdata/dnn/onnx/data/input_lstm_cell_bidirectional.npy
+ − testdata/dnn/onnx/data/input_lstm_cell_forward.npy
+ − testdata/dnn/onnx/data/input_lstm_cell_with_peepholes.npy
+ − testdata/dnn/onnx/data/input_output_registration_0.npy
+ − testdata/dnn/onnx/data/input_output_registration_1.npy
+ − testdata/dnn/onnx/data/input_slice_neg_starts.npy
+ − testdata/dnn/onnx/data/output_lstm_cell_bidirectional.npy
+ − testdata/dnn/onnx/data/output_lstm_cell_forward.npy
+ − testdata/dnn/onnx/data/output_lstm_cell_with_peepholes.npy
+ − testdata/dnn/onnx/data/output_output_registration.npy
+ − testdata/dnn/onnx/data/output_slice_neg_starts.npy
+90 −8 testdata/dnn/onnx/generate_onnx_models.py
+ − testdata/dnn/onnx/models/lstm_cell_bidirectional.onnx
+ − testdata/dnn/onnx/models/lstm_cell_forward.onnx
+ − testdata/dnn/onnx/models/lstm_cell_with_peepholes.onnx
+22 −0 testdata/dnn/onnx/models/output_registration.onnx
+ − testdata/dnn/onnx/models/slice_neg_starts.onnx
10 changes: 0 additions & 10 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,16 +362,6 @@ def _classify_installed_files_override(

print("Copying files from CMake output")

# lines for a proper work using pylint and an autocomplete in IDE
with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'r') as opencv_init:
opencv_init_lines = opencv_init.readlines()
extra_imports = ('\nfrom .cv2 import *\nfrom . import data\nfrom . import version\n')
free_line_after_imports = 5
opencv_init_lines.insert(free_line_after_imports, extra_imports)

with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'w') as opencv_final_init:
opencv_final_init.writelines(opencv_init_lines)

# add lines from the old __init__.py file to the config file
with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'scripts', '__init__.py'), 'r') as custom_init:
custom_init_data = custom_init.read()
Expand Down