Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 5 Nov 2021 09:27:46 +0000 (09:27 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 5 Nov 2021 09:27:46 +0000 (09:27 +0000)
commit7842181b47252e904dbcb8d319e13dc649cd47df
tree40a5cd19ad738fd994667bff2dff9524ac57dded
parent635990a5b0d2c7831cf8c98d3861b68e21921543
parent2ce47fda88ba54f8f2e52d2d36adc1efac902721
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/CMakeLists.txt
modules/dnn/src/caffe/caffe_importer.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/objdetect/src/qrcode.cpp
modules/videoio/src/cap_dshow.cpp