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

Merge pull request #11214 from take1014:core_9720

Browse Source 
* fix #9720

* Add regression test

* Fix calculation method for scale
This commit is contained in:
yuki takehara 2018-04-05 00:36:02 +09:00 committed by Alexander Alekhin
parent 7bc980edaf
commit d57e5c31c0
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,7 +420,7 @@ void MatOp::multiply(const MatExpr& e1, const MatExpr& e2, MatExpr& res, double
{
op = '/';
m2 = e2.a;
scale /= e2.alpha;
scale *= e2.alpha;
}
else
e2.op->assign(e2, m2);

13
modules/core/test/test_mat.cpp
View File

@ -1511,6 +1511,19 @@ TEST(Mat, regression_5991)
EXPECT_EQ(0, cvtest::norm(mat, Mat(3, sz, CV_8U, Scalar(1)), NORM_INF));
}
TEST(Mat, regression_9720)
{
Mat mat(1, 1, CV_32FC1);
mat.at<float>(0) = 1.f;
const float a = 0.1f;
Mat me1 = (Mat)(mat.mul((a / mat)));
Mat me2 = (Mat)(mat.mul((Mat)(a / mat)));
Mat me3 = (Mat)(mat.mul((a * mat)));
Mat me4 = (Mat)(mat.mul((Mat)(a * mat)));
EXPECT_EQ(me1.at<float>(0), me2.at<float>(0));
EXPECT_EQ(me3.at<float>(0), me4.at<float>(0));
}
#ifdef OPENCV_TEST_BIGDATA
TEST(Mat, regression_6696_BigData_8Gb)
{