mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: use matlab-style 1d fftShift in pc

Browse Source
This commit is contained in:
Vladislav Sovrasov 2017-07-12 17:59:47 +03:00
parent cddf868572
commit a683a496ea
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/imgproc/src/phasecorr.cpp
View File

@ -372,17 +372,18 @@ static void fftShift(InputOutputArray _out)
if(is_1d) if(is_1d)
{ {
int is_odd = (xMid > 0 && out.cols % 2 == 1) || (yMid > 0 && out.rows % 2 == 1);
xMid = xMid + yMid; xMid = xMid + yMid;
for(size_t i = 0; i < planes.size(); i++) for(size_t i = 0; i < planes.size(); i++)
{ {
Mat tmp; Mat tmp;
Mat half0(planes[i], Rect(0, 0, xMid, 1)); Mat half0(planes[i], Rect(0, 0, xMid + is_odd, 1));
Mat half1(planes[i], Rect(xMid, 0, xMid, 1)); Mat half1(planes[i], Rect(xMid + is_odd, 0, xMid, 1));
half0.copyTo(tmp); half0.copyTo(tmp);
half1.copyTo(half0); half1.copyTo(planes[i](Rect(0, 0, xMid, 1)));
tmp.copyTo(half1); tmp.copyTo(planes[i](Rect(xMid, 0, xMid + is_odd, 1)));
} }
} }
else else

17
modules/imgproc/test/test_pc.cpp
View File

@ -86,4 +86,21 @@ void CV_PhaseCorrelatorTest::run( int )
TEST(Imgproc_PhaseCorrelatorTest, accuracy) { CV_PhaseCorrelatorTest test; test.safe_run(); } TEST(Imgproc_PhaseCorrelatorTest, accuracy) { CV_PhaseCorrelatorTest test; test.safe_run(); }
TEST(Imgproc_PhaseCorrelatorTest, accuracy_1d_odd_fft) {
Mat r1 = Mat::ones(Size(129, 1), CV_64F)*255; // 129 will be completed to 135 before FFT
Mat r2 = Mat::ones(Size(129, 1), CV_64F)*255;
const int xShift = 10;
for(int i = 6; i < 20; i++)
{
r1.at<double>(i) = 1;
r2.at<double>(i + xShift) = 1;
}
Point2d phaseShift = phaseCorrelate(r1, r2);
ASSERT_NEAR(phaseShift.x, (double)xShift, .5);
}
} }