Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 15 Dec 2021 16:27:21 +0000 (16:27 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 15 Dec 2021 16:38:56 +0000 (16:38 +0000)
commit299f9837b7214e13082c64ffb26fb2e060a9c01e
tree56617c03a47b87227cbaad561ce428b656583e00
parent498f1525b2b589b8697f6e02110a0a728d66e9ce
parent6a889ed3e50d085ae6ac262bc8bd71d079941f39
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVDetectInferenceEngine.cmake
doc/tutorials/imgproc/pyramids/pyramids.markdown
modules/dnn/src/layers/padding_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_common.hpp
modules/dnn/test/test_common.impl.hpp
modules/dnn/test/test_onnx_conformance.cpp
modules/imgproc/test/test_color.cpp
platforms/winpack_dldt/build_package.py