Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 9 Oct 2020 20:08:00 +0000 (20:08 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 9 Oct 2020 20:09:26 +0000 (20:09 +0000)
commit1b443219ed181124978ed8627fb2da8db42765ab
treedbef8f62e5cd36573361162e3acb23ae95b2218a
parent76be3529f491aa5835602021c65ef99975837cac
parent8a1caa0d16a5803f92a71ddac744cc2803918695
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/test/test_common.impl.hpp
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_layers.cpp
modules/dnn/test/test_torch_importer.cpp