potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7872 from alalek:merge-2.4

Browse Source
This commit is contained in:
Alexander Alekhin
2016-12-16 16:03:14 +02:00
committed by GitHub
parent a206e12174
commit 0e4dde1781
9 changed files with 214 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/phasecorr.cpp
+3
View File
@@ -167,6 +167,9 @@ static void divSpectrums( InputArray _srcA, InputArray _srcB, OutputArray _dst,
_dst.create( srcA.rows, srcA.cols, type );
Mat dst = _dst.getMat();
CV_Assert(dst.data != srcA.data); // non-inplace check
CV_Assert(dst.data != srcB.data); // non-inplace check
bool is_1d = (flags & DFT_ROWS) || (rows == 1 || (cols == 1 &&
srcA.isContinuous() && srcB.isContinuous() && dst.isContinuous()));