potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

core: drop EXPR handing code in InputArray

Browse Source
This commit is contained in:
Alexander Alekhin
2020-04-13 03:53:03 +00:00
parent d7abb641ca
commit c8f1948d58
3 changed files with 10 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/matrix_expressions.cpp
+1 -11
View File
@@ -1739,13 +1739,7 @@ MatExpr Mat::mul(InputArray m, double scale) const
CV_INSTRUMENT_REGION();
MatExpr e;
if(m.kind() == _InputArray::EXPR)
{
const MatExpr& me = *(const MatExpr*)m.getObj();
me.op->multiply(MatExpr(*this), me, e, scale);
}
else
MatOp_Bin::makeExpr(e, '*', *this, m.getMat(), scale);
MatOp_Bin::makeExpr(e, '*', *this, m.getMat(), scale);
return e;
}
@@ -1840,7 +1834,6 @@ void MatExpr::swap(MatExpr& other)
_InputArray::_InputArray(const MatExpr& expr)
{
#if 1
if (!isIdentity(expr))
{
Mat result = expr; // TODO improve through refcount == 1 of expr.a (inplace operation is possible - except gemm?)
@@ -1849,9 +1842,6 @@ _InputArray::_InputArray(const MatExpr& expr)
}
CV_Assert(isIdentity(expr));
init(FIXED_TYPE + FIXED_SIZE + MAT + ACCESS_READ, &expr.a);
#else
init(FIXED_TYPE + FIXED_SIZE + EXPR + ACCESS_READ, &expr);
#endif
}
} // cv::