Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Sun, 23 May 2021 21:21:48 +0000 (21:21 +0000)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Sun, 23 May 2021 21:21:48 +0000 (21:21 +0000)
1  2 
doc/opencv.bib
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/phasecorr.cpp

diff --cc doc/opencv.bib
Simple merge
Simple merge