Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 12 May 2020 19:24:28 +0000 (19:24 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 12 May 2020 19:24:28 +0000 (19:24 +0000)
commit06bff34a6b4dedb6f187b6bb98e914d6d6701b39
tree0263f5f04e1b22c924dab4a7f916cdf6fb08a94e
parent77ddfa2fc9298819a2cba662cf521edb064f1978
parent6856cc72531d1cee50d4903a7ed02272c8fb326d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
15 files changed:
doc/tutorials/calib3d/table_of_content_calib3d.markdown
doc/tutorials/core/table_of_content_core.markdown
doc/tutorials/gpu/table_of_content_gpu.markdown
modules/calib3d/misc/java/test/Calib3dTest.java
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_onnx_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/videoio/src/cap_dshow.cpp
modules/videoio/src/cap_mfx_common.cpp
modules/videoio/src/cap_mfx_common.hpp
modules/videoio/src/cap_mfx_reader.cpp
modules/videoio/src/cap_mfx_writer.cpp