Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 24 Apr 2020 18:32:18 +0000 (18:32 +0000)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 24 Apr 2020 19:02:39 +0000 (19:02 +0000)
commit152e6476d9a270e6ce35d3f1b200a303654e576e
tree89346888deec7fca6d87bfc9c6a494845add3423
parent15b948d10954e36ebe648674668fbad463f6a5f9
parent8d05dab32c970b7c079c3bd8f03e8b7c7e8b6711
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
17 files changed:
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.markdown
modules/dnn/src/dnn.cpp
modules/dnn/src/onnx/onnx_graph_simplifier.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_halide_layers.cpp
modules/dnn/test/test_ie_models.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/test/test_descriptors_invariance.cpp
modules/features2d/test/test_descriptors_regression.cpp
modules/features2d/test/test_detectors_invariance.cpp
modules/features2d/test/test_detectors_regression.cpp
modules/videoio/doc/videoio_overview.markdown
modules/videoio/src/cap_aravis.cpp
samples/cpp/stitching_detailed.cpp