Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 2 Sep 2021 15:24:04 +0000 (15:24 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 2 Sep 2021 15:24:04 +0000 (15:24 +0000)
commit5aa7435d2537e677611390b530e31b3b204773a3
treef57594b1ebbcf08f86a05582caaac7629461fc94
parentc11195d5e3ad3593d33df600618884b90e41d7c5
parent7c23ec90a9e3e732201c8932275be219b8c2b097
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
14 files changed:
cmake/OpenCVCompilerOptions.cmake
modules/core/include/opencv2/core/bindings_utils.hpp
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/matx.hpp
modules/core/src/bindings_utils.cpp
modules/core/src/ocl.cpp
modules/dnn/misc/python/test/test_dnn.py
modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/gapi/misc/python/test/test_gapi_sample_pipelines.py
modules/python/src2/cv2.cpp
modules/python/test/test_misc.py