Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 15 Jun 2019 16:25:11 +0000 (16:25 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 15 Jun 2019 16:25:11 +0000 (16:25 +0000)
commit66d7956e672f06cc308e491b19c312187974639c
tree9a657fa5822687cad7a117a645fbe1127b14b9ec
parent3df83dce7e8e0af37bcdd997045cc3b97ba2fe05
parent1f519eea898482b60d790fbf47a51a5587ea1cd1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
19 files changed:
CMakeLists.txt
modules/calib3d/src/undistort.cpp
modules/dnn/include/opencv2/dnn/all_layers.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/concat_layer.cpp
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/detection_output_layer.cpp
modules/dnn/src/layers/elementwise_layers.cpp
modules/dnn/src/layers/eltwise_layer.cpp
modules/dnn/src/layers/lrn_layer.cpp
modules/dnn/src/layers/permute_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/layers/prior_box_layer.cpp
modules/dnn/src/layers/softmax_layer.cpp
modules/dnn/src/op_inf_engine.cpp
modules/dnn/src/op_inf_engine.hpp
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp
modules/dnn/test/test_backends.cpp
platforms/scripts/valgrind.supp