Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 2 Apr 2020 18:34:38 +0000 (18:34 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 2 Apr 2020 21:52:32 +0000 (21:52 +0000)
commitcf2a3c8e7430cc92569dd7f114609f9377b12d9e
treee27371a0d62ad860da11314538755a7846039c19
parent277f0d270fd77ffc3e22c9f08025207b4f384ef3
parent6216bf92210184467410b864286b41c23f010f32
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/src/ocl.cpp
modules/imgcodecs/test/test_read_write.cpp
modules/imgproc/test/test_imgwarp.cpp
modules/stitching/src/seam_finders.cpp
modules/videoio/src/cap_msmf.cpp