Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 1 May 2021 09:44:24 +0000 (09:44 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 1 May 2021 09:44:24 +0000 (09:44 +0000)
13 files changed:
1  2 
doc/Doxyfile.in
doc/tutorials/calib3d/real_time_pose/real_time_pose.markdown
modules/calib3d/include/opencv2/calib3d.hpp
modules/core/include/opencv2/core/cvdef.h
modules/core/src/system.cpp
modules/dnn/CMakeLists.txt
modules/dnn/src/ie_ngraph.cpp
modules/dnn/src/layers/crop_and_resize_layer.cpp
modules/imgproc/src/contours.cpp
modules/imgproc/src/templmatch.cpp
modules/imgproc/test/test_contours.cpp
modules/imgproc/test/test_templmatch.cpp
modules/stitching/src/matchers.cpp

diff --cc doc/Doxyfile.in
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge