Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 2 Oct 2019 14:49:19 +0000 (17:49 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 2 Oct 2019 14:49:19 +0000 (17:49 +0300)
commit3fb6617d62abc104c60f521316aeb50eec18cde7
tree60eee9e310582f227a9cdc29e88bd92ccd09bd64
parent3133bb49aa1af0152b155d6299c3fcecefce317a
parenta105f56957c61ffa05c3361c375e3f7f272c2aa2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/misc/python/test/test_dnn.py
modules/dnn/test/test_misc.cpp
modules/imgcodecs/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/js/src/embindgen.py
modules/objdetect/src/qrcode.cpp
modules/videoio/src/cap_dshow.cpp