Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 13 Nov 2020 22:29:14 +0000 (22:29 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 13 Nov 2020 22:29:14 +0000 (22:29 +0000)
commita7c150ec66deb5e20d56ffdf7321fb021beb9c35
treec8dce378eb6f2cdd40edbaff680ff0b9e22e670a
parent389495f76a29366d0044380345c29d0d28702d50
parent61144f935efaae03d506ab2b54ee02b3bc1a4452
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/perf/perf_convolution3d.cpp
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/java/generator/gen_java.py
modules/python/src2/hdr_parser.py