potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages 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
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/matrix_expressions.cpp
+1 -1
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);