Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Sat, 29 May 2021 19:00:14 +0000 (19:00 +0000)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Sat, 29 May 2021 19:00:14 +0000 (19:00 +0000)
commitcb51a155b2e5887a8cf533a912c24fa943d0a52a
tree8108cff032ce6643be97bb754f8ccdffea486119
parent9c16408e9171cb314f93a0537eff6bace035746b
parentd3be58b6d7464c9e7d1d1d4755cc45ba70917071
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/src/ocl.cpp
modules/core/test/ocl/test_opencl.cpp
modules/imgproc/src/phasecorr.cpp