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

added perf test

Browse Source
This commit is contained in:
Ilya Lavrenov
2014-02-05 19:35:00 +04:00
parent 563dc5aa38
commit e190d3fd36
5 changed files with 31 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/umatrix.cpp
View File

@@ -551,14 +551,6 @@ int UMat::checkVector(int _elemChannels, int _depth, bool _requireContinuous) co
? (int)(total()*channels()/_elemChannels) : -1;
}
UMat UMat::cross(InputArray) const
{
CV_Error(CV_StsNotImplemented, "");
return UMat();
}
UMat UMat::reshape(int _cn, int _newndims, const int* _newsz) const
{
if(_newndims == dims)
@@ -819,6 +811,8 @@ UMat UMat::mul(InputArray m, double scale) const
return dst;
}
#ifdef HAVE_OPENCL
static bool ocl_dot( InputArray _src1, InputArray _src2, double & res )
{
int type = _src1.type(), depth = CV_MAT_DEPTH(type);
@@ -861,6 +855,8 @@ static bool ocl_dot( InputArray _src1, InputArray _src2, double & res )
return false;
}
#endif
double UMat::dot(InputArray m) const
{
CV_Assert(m.sameSize(*this) && m.type() == type());