mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-09 18:43:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25738 from rlexmann:imgproc_fix_divSpectrums

Browse Source 
Fix arithmetics in CV_32F branch of divSpectrums()
This commit is contained in:
Alexander Smorkalov 2024-06-11 11:16:23 +03:00 committed by GitHub
commit 8e9307074c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,18 +252,18 @@ void divSpectrums( InputArray _srcA, InputArray _srcB, OutputArray _dst, int fla
if( !conjB ) if( !conjB )
for( j = j0; j < j1; j += 2 ) for( j = j0; j < j1; j += 2 )
{ {
double denom = (double)(dataB[j]*dataB[j] + dataB[j+1]*dataB[j+1] + eps); double denom = (double)dataB[j]*dataB[j] + (double)dataB[j+1]*dataB[j+1] + (double)eps;
double re = (double)(dataA[j]*dataB[j] + dataA[j+1]*dataB[j+1]); double re = (double)dataA[j]*dataB[j] + (double)dataA[j+1]*dataB[j+1];
double im = (double)(dataA[j+1]*dataB[j] - dataA[j]*dataB[j+1]); double im = (double)dataA[j+1]*dataB[j] - (double)dataA[j]*dataB[j+1];
dataC[j] = (float)(re / denom); dataC[j] = (float)(re / denom);
dataC[j+1] = (float)(im / denom); dataC[j+1] = (float)(im / denom);
} }
else else
for( j = j0; j < j1; j += 2 ) for( j = j0; j < j1; j += 2 )
{ {
double denom = (double)(dataB[j]*dataB[j] + dataB[j+1]*dataB[j+1] + eps); double denom = (double)dataB[j]*dataB[j] + (double)dataB[j+1]*dataB[j+1] + (double)eps;
double re = (double)(dataA[j]*dataB[j] - dataA[j+1]*dataB[j+1]); double re = (double)dataA[j]*dataB[j] - (double)dataA[j+1]*dataB[j+1];
double im = (double)(dataA[j+1]*dataB[j] + dataA[j]*dataB[j+1]); double im = (double)dataA[j+1]*dataB[j] + (double)dataA[j]*dataB[j+1];
dataC[j] = (float)(re / denom); dataC[j] = (float)(re / denom);
dataC[j+1] = (float)(im / denom); dataC[j+1] = (float)(im / denom);
} }

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

@ -120,6 +120,35 @@ TEST(Imgproc_PhaseCorrelatorTest, accuracy_1d_odd_fft) {
ASSERT_NEAR(phaseShift.x, (double)xShift, 1.); ASSERT_NEAR(phaseShift.x, (double)xShift, 1.);
} }
TEST(Imgproc_PhaseCorrelatorTest, float32_overflow) {
// load
Mat im = imread(cvtest::TS::ptr()->get_data_path() + "shared/baboon.png", IMREAD_GRAYSCALE);
ASSERT_EQ(im.type(), CV_8UC1);
// convert to 32F, scale values as if original image was 16U
constexpr auto u8Max = std::numeric_limits<std::uint8_t>::max();
constexpr auto u16Max = std::numeric_limits<std::uint16_t>::max();
im.convertTo(im, CV_32FC1, double(u16Max) / double(u8Max));
// enlarge and create ROIs
const auto w = im.cols * 5;
const auto h = im.rows * 5;
const auto roiW = (w * 2) / 3; // 50% overlap
Mat imLarge;
resize(im, imLarge, { w, h });
const auto roiLeft = imLarge(Rect(0, 0, roiW, h));
const auto roiRight = imLarge(Rect(w - roiW, 0, roiW, h));
// correlate
double response = 0.0;
Point2d phaseShift = phaseCorrelate(roiLeft, roiRight, cv::noArray(), &response);
ASSERT_TRUE(std::isnormal(phaseShift.x) || 0.0 == phaseShift.x);
ASSERT_TRUE(std::isnormal(phaseShift.y) || 0.0 == phaseShift.y);
ASSERT_TRUE(std::isnormal(response) || 0.0 == response);
EXPECT_NEAR(std::abs(phaseShift.x), w / 3.0, 1.0);
EXPECT_NEAR(std::abs(phaseShift.y), 0.0, 1.0);
}
////////////////////// DivSpectrums //////////////////////// ////////////////////// DivSpectrums ////////////////////////
class CV_DivSpectrumsTest : public cvtest::ArrayTest class CV_DivSpectrumsTest : public cvtest::ArrayTest
{ {