Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 30 Apr 2019 19:59:49 +0000 (19:59 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 1 May 2019 08:27:45 +0000 (08:27 +0000)
commite28e3c9491898502cfd64a3e145e56e5482b7891
treeb658dfc9aece0ef55fe2dcbd38902c904741b2a0
parent076ee65c858e9a5483b44a262dae247abee8685e
parent163d5e4d3956f092dc973375f3efef806d42004d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
24 files changed:
CMakeLists.txt
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVFindLibsGUI.cmake
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/misc/java/test/Calib3dTest.java
modules/calib3d/src/fundam.cpp
modules/core/include/opencv2/core/utility.hpp
modules/dnn/include/opencv2/dnn/all_layers.hpp
modules/dnn/include/opencv2/dnn/version.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/detection_output_layer.cpp
modules/dnn/src/layers/lrn_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/op_inf_engine.cpp
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_backends.cpp
modules/dnn/test/test_common.hpp
modules/ts/src/ts.cpp
modules/ts/src/ts_perf.cpp
modules/videoio/src/cap_v4l.cpp
samples/cpp/detect_mser.cpp