8000 Merge pull request #671 from asenyaev/asen/3.4.18_release · arpitjain799/opencv-python@ba1ef82 · GitHub
[go: up one dir, main page]
Skip to content

Commit ba1ef82

Browse files
asenyaevasenyaev
authored
Merge pull request opencv#671 from asenyaev/asen/3.4.18_release
Update 3.4 branch for 3.4.18 release
2 parents 3b795ec + 6521b4b commit ba1ef82

File tree

4 files changed

+3
-13
lines changed

4 files changed

+3
-13
lines changed

‎opencv

Submodule opencv updated 201 files

‎opencv_contrib

Submodule opencv_contrib updated 47 files
  • modules/aruco/test/test_charucodetection.cpp
    +92
    -125
  • modules/aruco/tutorials/aruco_board_detection/aruco_board_detection.markdown
    +5
    -4
  • 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
  • modules/aruco/tutorials/aruco_detection/aruco_detection.markdown
    +5
    -4
  • modules/aruco/tutorials/aruco_detection/images/singlemarkersaxes.jpg
  • modules/aruco/tutorials/aruco_faq/aruco_faq.markdown
    +14
    -2
  • modules/aruco/tutorials/charuco_detection/charuco_detection.markdown
    +1
    -1
  • modules/aruco/tutorials/charuco_detection/images/chaxis.jpg
  • modules/aruco/tutorials/charuco_diamond_detection/charuco_diamond_detection.markdown
    +3
    -3
  • modules/aruco/tutorials/charuco_diamond_detection/images/diamondsaxis.jpg
  • modules/aruco/tutorials/charuco_diamond_detection/images/diamondsaxis.png
  • modules/line_descriptor/src/binary_descriptor.cpp
    +5
  • modules/sfm/CMakeLists.txt
    +2
  • modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt
    +1
    -1
  • modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc
    +22
  • modules/surface_matching/src/pose_3d.cpp
    +1
    -1
  • modules/ximgproc/include/opencv2/ximgproc/edge_drawing.hpp
    +41
    -17
  • modules/ximgproc/src/edge_drawing.cpp
    +12
    -6
  • modules/ximgproc/test/test_fld.cpp
    +1
    -1

    • ‎opencv_extra

    Submodule opencv_extra updated 21 files

    ‎setup.py

    Lines changed: 0 additions & 10 deletions
    Original file line numberDiff line numberDiff line change
    @@ -362,16 +362,6 @@ def _classify_installed_files_override(
    362362

    363363
    print("Copying files from CMake output")
    364364

    365-
    # lines for a proper work using pylint and an autocomplete in IDE
    366-
    with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'r') as opencv_init:
    367-
    opencv_init_lines = opencv_init.readlines()
    368-
    extra_imports = ('\nfrom .cv2 import *\nfrom . import data\nfrom . import version\n')
    369-
    free_line_after_imports = 5
    370-
    opencv_init_lines.insert(free_line_after_imports, extra_imports)
    371-
    372-
    with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'w') as opencv_final_init:
    373-
    opencv_final_init.writelines(opencv_init_lines)
    374-
    375365
    # add lines from the old __init__.py file to the config file
    376366
    with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'scripts', '__init__.py'), 'r') as custom_init:
    377367
    custom_init_data = custom_init.read()

    0 commit comments

    Comments
     (0)
    0