Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Aug 2020 17:23:24 +0000 (17:23 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Aug 2020 19:45:45 +0000 (19:45 +0000)
commitb45273eccb01323f5615b8900fd35407b1148939
treef4b4f25e222a84cdc6d6a5c07a636d1c69f88455
parent949fe93d5aa219be95c63598b11835afff0a1b65
parent68f527267bdeb6179d0b37665b29b4412d69794a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/src/ocl.cpp
modules/dnn/src/layers/fully_connected_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/onnx/onnx_graph_simplifier.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_layers.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/flann/include/opencv2/flann/kmeans_index.h