Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 12 Jan 2020 09:34:34 +0000 (09:34 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 12 Jan 2020 09:35:39 +0000 (09:35 +0000)
commitfb61f88b9c32c22c222a55f885c4b6a7f475b396
treee38416413f8d8f7c4015e79bcdc10ad0c46202ee
parent1e32781b54e87a2fa99eabdacd920d07492db3d2
parent38e6d668b1087f45198dfe633cc8ad7319e996ea
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
doc/tutorials/core/file_input_output_with_xml_yml/file_input_output_with_xml_yml.markdown
doc/tutorials/video/meanshift/meanshift.markdown
doc/tutorials/video/optical_flow/optical_flow.markdown
modules/core/src/arithm.cpp
modules/core/src/arithm.simd.hpp
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/imgcodecs/src/utils.cpp