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)
commitae4cc404c15a206e7bc953e183e9a6812df6d5b0
treedcf879710911f4dc37dcc7950430367f36372d12
parentac8e7d57dc64b0fbb41710f11cbd0338ec1219a7
parent5f4e55bc68db4a105fcafa465c19c047d35a2e0e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
doc/opencv.bib
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/phasecorr.cpp