Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 6 Mar 2021 17:29:12 +0000 (17:29 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 6 Mar 2021 17:31:08 +0000 (17:31 +0000)
commitd643a90efa643f10b1426028acaa97aecef54bdf
tree411ff1f932d10c8d63b5ddfc97f0e58372fae1f0
parentb450dd7a87bc69997a8417d94bdfb87427a9fe62
parent04a9ff88d80fd2757b0545e7420884a4394394af
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
modules/core/include/opencv2/core/base.hpp
modules/dnn/src/ie_ngraph.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/imgcodecs/src/grfmt_exr.cpp
modules/imgcodecs/test/test_exr.impl.hpp
modules/objdetect/src/qrcode.cpp