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

Fixed trailing whitespace

Browse Source
This commit is contained in:
DeanF 2014-04-01 22:04:58 +03:00
parent bdc91c66c9
commit 48df67a9c5
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -667,9 +667,7 @@ void UMat::copyTo(OutputArray _dst, InputArray _mask) const
copyTo(_dst); copyTo(_dst);
return; return;
} }
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
int cn = channels(), mtype = _mask.type(), mdepth = CV_MAT_DEPTH(mtype), mcn = CV_MAT_CN(mtype); int cn = channels(), mtype = _mask.type(), mdepth = CV_MAT_DEPTH(mtype), mcn = CV_MAT_CN(mtype);
CV_Assert( mdepth == CV_8U && (mcn == 1 || mcn == cn) ); CV_Assert( mdepth == CV_8U && (mcn == 1 || mcn == cn) );
@ -697,7 +695,6 @@ void UMat::copyTo(OutputArray _dst, InputArray _mask) const
} }
} }
#endif #endif
Mat src = getMat(ACCESS_READ); Mat src = getMat(ACCESS_READ);
src.copyTo(_dst, _mask); src.copyTo(_dst, _mask);
} }
@ -718,9 +715,7 @@ void UMat::convertTo(OutputArray _dst, int _type, double alpha, double beta) con
copyTo(_dst); copyTo(_dst);
return; return;
} }
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
bool doubleSupport = ocl::Device::getDefault().doubleFPConfig() > 0; bool doubleSupport = ocl::Device::getDefault().doubleFPConfig() > 0;
bool needDouble = sdepth == CV_64F || ddepth == CV_64F; bool needDouble = sdepth == CV_64F || ddepth == CV_64F;
if( dims <= 2 && cn && _dst.isUMat() && ocl::useOpenCL() && if( dims <= 2 && cn && _dst.isUMat() && ocl::useOpenCL() &&
@ -756,7 +751,6 @@ void UMat::convertTo(OutputArray _dst, int _type, double alpha, double beta) con
} }
} }
#endif #endif
Mat m = getMat(ACCESS_READ); Mat m = getMat(ACCESS_READ);
m.convertTo(_dst, _type, alpha, beta); m.convertTo(_dst, _type, alpha, beta);
} }
@ -764,7 +758,6 @@ void UMat::convertTo(OutputArray _dst, int _type, double alpha, double beta) con
UMat& UMat::setTo(InputArray _value, InputArray _mask) UMat& UMat::setTo(InputArray _value, InputArray _mask)
{ {
bool haveMask = !_mask.empty(); bool haveMask = !_mask.empty();
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
int tp = type(), cn = CV_MAT_CN(tp); int tp = type(), cn = CV_MAT_CN(tp);
@ -807,7 +800,6 @@ UMat& UMat::setTo(InputArray _value, InputArray _mask)
} }
} }
#endif #endif
Mat m = getMat(haveMask ? ACCESS_RW : ACCESS_WRITE); Mat m = getMat(haveMask ? ACCESS_RW : ACCESS_WRITE);
m.setTo(_value, _mask); m.setTo(_value, _mask);
return *this; return *this;