Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 10 Feb 2020 16:40:29 +0000 (19:40 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 10 Feb 2020 16:40:29 +0000 (19:40 +0300)
commitaa2777ed61ffb4e56ff2a681708b3bcca76f154c
tree09b86a09489f77824a19d1519af81783050a76ea
parent8a588f2c0b0ceb71179684f6700aca4f23bdf48b
parent1dd24eeec02972990ad4851c162eff2235130036
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
17 files changed:
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/utility.hpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_backends.cpp
modules/dnn/test/test_caffe_importer.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_misc.cpp
modules/dnn/test/test_tf_importer.cpp
modules/dnn/test/test_torch_importer.cpp
modules/imgcodecs/include/opencv2/imgcodecs.hpp
modules/imgcodecs/src/loadsave.cpp
modules/python/src2/cv2.cpp
modules/videoio/include/opencv2/videoio.hpp
modules/videoio/src/cap_msmf.cpp
modules/videoio/test/test_video_io.cpp
samples/CMakeLists.txt