Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 4 Feb 2020 16:49:24 +0000 (19:49 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 4 Feb 2020 16:49:24 +0000 (19:49 +0300)
commit225566da7bab2147d7109f42a0ec9d6039963edb
treeac89f03b92d0b913df0c5ceae58720678ef4e5d7
parent0dd1ce1a4ffdb1340fcd86fe436981b11fcfd58f
parent0cb3bf95f12519a35291fddeedefd48192fee0a4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVUtils.cmake
modules/calib3d/include/opencv2/calib3d.hpp
modules/dnn/src/layers/resize_layer.cpp
modules/dnn/test/test_layers.cpp
modules/highgui/src/window_QT.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/drawing.cpp
modules/objdetect/src/qrcode.cpp
modules/videoio/src/cap_avfoundation.mm