Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 12 Jul 2019 18:43:27 +0000 (18:43 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 12 Jul 2019 18:45:06 +0000 (18:45 +0000)
commitf6c573880e57e78e0c07d8832ee6015f2337a019
treedeca95c26fe6f2dec7d4f36bb325f2a530cd3db9
parentf663e8f903645a3dd66f6833f63717b86e861d77
parent054c7962135e762ae2992e2ab709ef6325e04148
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp