Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 21 Feb 2021 20:14:09 +0000 (20:14 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 21 Feb 2021 20:14:09 +0000 (20:14 +0000)
16 files changed:
1  2 
cmake/OpenCVFindLibsGrfmt.cmake
cmake/OpenCVUtils.cmake
doc/tutorials/imgproc/pyramids/pyramids.markdown
modules/calib3d/src/calibinit.cpp
modules/calib3d/test/test_chesscorners.cpp
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/simd_intrinsics.hpp
modules/core/src/matrix_operations.cpp
modules/core/src/matrix_wrap.cpp
modules/dnn/src/layers/proposal_layer.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/highgui/CMakeLists.txt
modules/imgcodecs/CMakeLists.txt
modules/video/src/lkpyramid.cpp
samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge