Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 24 Dec 2021 16:35:47 +0000 (16:35 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 24 Dec 2021 16:48:07 +0000 (16:48 +0000)
commit217fea96676f415762a5e6e46177162b4f95f0bc
treeaac53470a782b42d3e2787b974c89be63ed96d41
parent9777fbacf6799512551b937362249aa24ca07ce2
parent655d381ef31d8c255278af1e200565f39491a9a2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
23 files changed:
CMakeLists.txt
cmake/OpenCVFindLibsGrfmt.cmake
cmake/OpenCVFindOpenEXR.cmake
doc/opencv.bib
doc/tutorials/introduction/windows_install/windows_install.markdown
modules/calib3d/doc/calib3d.bib
modules/calib3d/include/opencv2/calib3d.hpp
modules/core/include/opencv2/core/bindings_utils.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/dnn_common.hpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/onnx/onnx_graph_simplifier.cpp
modules/dnn/src/onnx/onnx_graph_simplifier.hpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/precomp.hpp
modules/dnn/src/tensorflow/tf_graph_simplifier.hpp
modules/dnn/test/test_onnx_importer.cpp
modules/highgui/src/window_gtk.cpp
modules/imgcodecs/CMakeLists.txt
modules/imgcodecs/src/grfmt_exr.cpp
modules/imgcodecs/test/test_grfmt.cpp
modules/python/src2/cv2_convert.hpp
modules/python/test/test_misc.py