mirrors/opencv
2
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-25 04:09:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29966 from pbkx:fix-calc-covar-vector-mean-roi

Browse Source 
fix calcCovarMatrix vector mean ROI handling
This commit is contained in:
Alexander Smorkalov
2026-09-17 15:58:10 +03:00
committed by GitHub
parent a31b3d5e85 db189ed863
commit 186f31f09e
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/matmul.dispatch.cpp
+6 -8
View File
@@ -757,17 +757,15 @@ void calcCovarMatrix( InputArray _src, OutputArray _covar, InputOutputArray _mea
if( (flags & cv::COVAR_USE_AVG) != 0 )
{
CV_Assert( _mean.size() == size );
Mat mean0 = _mean.getMat();
if( mean.type() != ctype )
if( mean0.isContinuous() && mean0.type() == ctype )
mean = mean0.reshape(1, 1);
else
{
mean = _mean.getMat();
_mean.create(mean.size(), ctype);
Mat tmp = _mean.getMat();
mean.convertTo(tmp, ctype);
mean = tmp;
mean0.convertTo(mean, ctype);
mean = mean.reshape(1, 1);
}
mean = _mean.getMat().reshape(1, 1);
}
calcCovarMatrix( _data, _covar, mean, (flags & ~(cv::COVAR_ROWS|cv::COVAR_COLS)) | cv::COVAR_ROWS, ctype );
modules/core/test/test_math.cpp
+34
View File
@@ -3340,6 +3340,40 @@ TEST(CovariationMatrixVectorOfMatWithMean, accuracy)
ASSERT_EQ(sDiff.dot(sDiff), 0.0);
}
TEST(CovariationMatrixVectorOfMatWithMean, non_contiguous_mean)
{
std::vector<cv::Mat> samples;
samples.push_back((cv::Mat_<float>(2, 2) << 1, 2, 3, 4));
samples.push_back((cv::Mat_<float>(2, 2) << 2, 4, 6, 8));
samples.push_back((cv::Mat_<float>(2, 2) << 3, 6, 9, 12));
const float sentinel0 = 12345.0f;
const float sentinel1 = -12345.0f;
cv::Mat meanStorage = (cv::Mat_<float>(2, 3) <<
10, 20, sentinel0,
30, 40, sentinel1);
cv::Mat meanROI = meanStorage(cv::Rect(0, 0, 2, 2));
cv::Mat expectedMean = meanROI.clone();
cv::Mat continuousMean = expectedMean.clone();
ASSERT_TRUE(continuousMean.isContinuous());
ASSERT_FALSE(meanROI.isContinuous());
ASSERT_EQ(0, cvtest::norm(expectedMean, meanROI, cv::NORM_INF));
const int flags = cv::COVAR_ROWS | cv::COVAR_USE_AVG;
cv::Mat covContinuous, covROI, covPointer;
ASSERT_NO_THROW(cv::calcCovarMatrix(samples, covContinuous, continuousMean, flags, CV_32F));
ASSERT_NO_THROW(cv::calcCovarMatrix(&samples[0], static_cast<int>(samples.size()),
covPointer, meanROI, flags, CV_32F));
ASSERT_NO_THROW(cv::calcCovarMatrix(samples, covROI, meanROI, flags, CV_32F));
EXPECT_EQ(0, cvtest::norm(covContinuous, covROI, cv::NORM_INF));
EXPECT_EQ(0, cvtest::norm(covPointer, covROI, cv::NORM_INF));
EXPECT_EQ(0, cvtest::norm(expectedMean, continuousMean, cv::NORM_INF));
EXPECT_EQ(0, cvtest::norm(expectedMean, meanROI, cv::NORM_INF));
EXPECT_EQ(sentinel0, meanStorage.at<float>(0, 2));
EXPECT_EQ(sentinel1, meanStorage.at<float>(1, 2));
}
TEST(Core_Pow, special)
{
for( int i = 0; i < 100; i++ )