generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6953 from ilya-lavrenov:arithm

Browse Source
This commit is contained in:
Vadim Pisarevsky 2016-07-20 13:42:30 +00:00
commit c4cc54e5da
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/arithm.cpp
View File

@ -643,7 +643,7 @@ static void arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,
if (!muldiv) if (!muldiv)
{ {
Mat sc = psrc2->getMat(); Mat sc = psrc2->getMat();
depth2 = actualScalarDepth(sc.ptr<double>(), cn); depth2 = actualScalarDepth(sc.ptr<double>(), sz2 == Size(1, 1) ? cn2 : cn);
if( depth2 == CV_64F && (depth1 < CV_32S || depth1 == CV_32F) ) if( depth2 == CV_64F && (depth1 < CV_32S || depth1 == CV_32F) )
depth2 = CV_32F; depth2 = CV_32F;
} }

18
modules/core/test/test_arithm.cpp
View File

@ -1910,3 +1910,21 @@ TEST(MinMaxLoc, regression_4955_nans)
cv::Mat nan_mat(2, 2, CV_32F, cv::Scalar(NAN)); cv::Mat nan_mat(2, 2, CV_32F, cv::Scalar(NAN));
cv::minMaxLoc(nan_mat, NULL, NULL, NULL, NULL); cv::minMaxLoc(nan_mat, NULL, NULL, NULL, NULL);
} }
TEST(Subtract, scalarc1_matc3)
{
int scalar = 255;
cv::Mat srcImage(5, 5, CV_8UC3, cv::Scalar::all(5)), destImage;
cv::subtract(scalar, srcImage, destImage);
ASSERT_EQ(0, cv::norm(cv::Mat(5, 5, CV_8UC3, cv::Scalar::all(250)), destImage, cv::NORM_INF));
}
TEST(Subtract, scalarc4_matc4)
{
cv::Scalar sc(255, 255, 255, 255);
cv::Mat srcImage(5, 5, CV_8UC4, cv::Scalar::all(5)), destImage;
cv::subtract(sc, srcImage, destImage);
ASSERT_EQ(0, cv::norm(cv::Mat(5, 5, CV_8UC4, cv::Scalar::all(250)), destImage, cv::NORM_INF));
}