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

add oclMatExpr class to prevent extra allocations

Browse Source
This commit is contained in:
yao
2013-02-16 11:05:23 +08:00
parent 0b365f6aa5
commit 69fd2d8273
3 changed files with 73 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
modules/ocl/src/arithm.cpp
View File

@@ -2153,34 +2153,56 @@ cv::ocl::oclMat cv::ocl::operator ^ (const oclMat &src1, const oclMat &src2)
return dst;
}
cv::ocl::oclMat cv::ocl::operator + (const oclMat &src1, const oclMat &src2)
cv::ocl::oclMatExpr cv::ocl::operator + (const oclMat &src1, const oclMat &src2)
{
oclMat dst;
add(src1, src2, dst);
oclMatExpr dst(src1, src2, cv::ocl::MAT_ADD);
return dst;
}
cv::ocl::oclMat cv::ocl::operator - (const oclMat &src1, const oclMat &src2)
cv::ocl::oclMatExpr cv::ocl::operator - (const oclMat &src1, const oclMat &src2)
{
oclMat dst;
subtract(src1, src2, dst);
oclMatExpr dst(src1, src2, cv::ocl::MAT_SUB);
return dst;
}
cv::ocl::oclMat cv::ocl::operator * (const oclMat &src1, const oclMat &src2)
cv::ocl::oclMatExpr cv::ocl::operator * (const oclMat &src1, const oclMat &src2)
{
oclMat dst;
multiply(src1, src2, dst);
oclMatExpr dst(src1, src2, cv::ocl::MAT_MUL);
return dst;
}
cv::ocl::oclMat cv::ocl::operator / (const oclMat &src1, const oclMat &src2)
cv::ocl::oclMatExpr cv::ocl::operator / (const oclMat &src1, const oclMat &src2)
{
oclMat dst;
divide(src1, src2, dst);
oclMatExpr dst(src1, src2, cv::ocl::MAT_DIV);
return dst;
}
void oclMatExpr::assign(oclMat& m) const
{
switch (op)
{
case MAT_ADD:
add(a, b, m);
break;
case MAT_SUB:
subtract(a, b, m);
break;
case MAT_MUL:
multiply(a, b, m);
break;
case MAT_DIV:
divide(a, b, m);
break;
}
}
oclMatExpr::operator oclMat() const
{
oclMat m;
assign(m);
return m;
}
//////////////////////////////////////////////////////////////////////////////
/////////////////////////////// transpose ////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////