Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 13 Jul 2020 19:54:49 +0000 (19:54 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 13 Jul 2020 19:54:49 +0000 (19:54 +0000)
commite5e767abc1314f918a848e0b912dc9574c19bfaf
treeae53b786e2463da87ec2e0ab7de157351e3ec075
parent521aac9665625b3583522a9c2e89109a81ae886f
parentd41b20b2685032b451167d963cf097416a9e5d25
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVDetectCUDA.cmake
modules/dnn/src/op_inf_engine.cpp
modules/features2d/src/matchers.cpp
modules/features2d/test/test_matchers_algorithmic.cpp
modules/flann/include/opencv2/flann.hpp
modules/videoio/src/cap_v4l.cpp