Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 18 Dec 2018 19:07:43 +0000 (19:07 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 18 Dec 2018 19:07:43 +0000 (19:07 +0000)
commit7fb70e170154d064ef12d8fec61c0ae70812ce3d
treefaed983be09f5c24e6690529cd80431345808bc4
parent2fb409b286acb0d16495ddc93326c8bf1944f1aa
parentb0a08cced92324b7b98d689dca773a1ef9b9c44e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
13 files changed:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
cmake/OpenCVFindLibsVideo.cmake
cmake/OpenCVGenSetupVars.cmake
doc/tutorials/imgproc/histograms/template_matching/template_matching.markdown
modules/core/src/ocl.cpp
modules/core/test/test_mat.cpp
modules/imgproc/src/deriv.cpp
modules/stitching/perf/perf_stich.cpp
modules/stitching/src/exposure_compensate.cpp
modules/videoio/CMakeLists.txt
modules/videoio/src/cap_dc1394_v2.cpp
modules/videoio/src/cap_msmf.cpp