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

Fixed trailing whitespace

Browse Source
This commit is contained in:
Elena Gvozdeva 2013-12-16 18:06:11 +04:00
parent b2d8b491c0
commit 8fe4e98b8a
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/imgproc/src/opencl/medianFilter.cl
View File

@ -46,7 +46,7 @@ __kernel void medianFilter3(__global const uchar* srcptr, int srcStep, int srcOf
int gx= get_global_id(0); int gx= get_global_id(0);
int gy= get_global_id(1); int gy= get_global_id(1);
int dx = gx - x - 1; int dx = gx - x - 1;
int dy = gy - y - 1; int dy = gy - y - 1;
@ -59,7 +59,7 @@ __kernel void medianFilter3(__global const uchar* srcptr, int srcStep, int srcOf
int r = clamp(dy+dr, 0, rows-1); int r = clamp(dy+dr, 0, rows-1);
int index1 = mad24(r, srcStep, srcOffset + c*scnbytes); int index1 = mad24(r, srcStep, srcOffset + c*scnbytes);
r = clamp(dy+dr+9, 0, rows-1); r = clamp(dy+dr+9, 0, rows-1);
int index9 = mad24(r, srcStep, srcOffset + c*scnbytes); int index9 = mad24(r, srcStep, srcOffset + c*scnbytes);
@ -110,15 +110,15 @@ __kernel void medianFilter5(__global const uchar* srcptr, int srcStep, int srcOf
int dr=id/20; int dr=id/20;
int dc=id%20; int dc=id%20;
int c=clamp(dx+dc, 0, cols-1); int c=clamp(dx+dc, 0, cols-1);
int r = clamp(dy+dr, 0, rows-1); int r = clamp(dy+dr, 0, rows-1);
int index1 = mad24(r, srcStep, srcOffset + c*scnbytes); int index1 = mad24(r, srcStep, srcOffset + c*scnbytes);
r = clamp(dy+dr+10, 0, rows-1); r = clamp(dy+dr+10, 0, rows-1);
int index10 = mad24(r, srcStep, srcOffset + c*scnbytes); int index10 = mad24(r, srcStep, srcOffset + c*scnbytes);
__global DATA_TYPE * src = (__global DATA_TYPE *)(srcptr + index1); __global DATA_TYPE * src = (__global DATA_TYPE *)(srcptr + index1);
data[dr][dc] = src[0]; data[dr][dc] = src[0];
src = (__global DATA_TYPE *)(srcptr + index10); src = (__global DATA_TYPE *)(srcptr + index10);
@ -158,7 +158,7 @@ __kernel void medianFilter5(__global const uchar* srcptr, int srcStep, int srcOf
op(p7, p11); op(p11, p13); op(p11, p12); op(p7, p11); op(p11, p13); op(p11, p12);
int dst_index = mad24( gy, dstStep, dstOffset + gx * scnbytes); int dst_index = mad24( gy, dstStep, dstOffset + gx * scnbytes);
if( gy < rows && gx < cols) if( gy < rows && gx < cols)
{ {
__global DATA_TYPE* dst = (__global DATA_TYPE *)(dstptr + dst_index); __global DATA_TYPE* dst = (__global DATA_TYPE *)(dstptr + dst_index);

20
modules/imgproc/src/smooth.cpp
View File

@ -1667,12 +1667,12 @@ namespace cv
{ {
int type = _src.type(); int type = _src.type();
int depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type); int depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type);
if (!((depth == CV_8U || depth == CV_16U || depth == CV_16S || depth == CV_32F) && (cn == 1 || cn == 4))) if (!((depth == CV_8U || depth == CV_16U || depth == CV_16S || depth == CV_32F) && (cn == 1 || cn == 4)))
return false; return false;
const char * kernelName; const char * kernelName;
if (m==3) if (m==3)
kernelName = "medianFilter3"; kernelName = "medianFilter3";
else if (m==5) else if (m==5)
@ -1683,7 +1683,7 @@ namespace cv
ocl::Kernel k(kernelName,ocl::imgproc::medianFilter_oclsrc,format("-D type=%s",ocl::typeToStr(type))); ocl::Kernel k(kernelName,ocl::imgproc::medianFilter_oclsrc,format("-D type=%s",ocl::typeToStr(type)));
if (k.empty()) if (k.empty())
return false; return false;
_dst.create(_src.size(),type); _dst.create(_src.size(),type);
UMat src = _src.getUMat(), dst = _dst.getUMat(); UMat src = _src.getUMat(), dst = _dst.getUMat();
@ -1699,20 +1699,18 @@ void cv::medianBlur( InputArray _src0, OutputArray _dst, int ksize )
CV_Assert( ksize % 2 == 1 ); CV_Assert( ksize % 2 == 1 );
if( ksize <= 1 ) if( ksize <= 1 )
{ {
Mat src0 = _src0.getMat(); Mat src0 = _src0.getMat();
_dst.create( src0.size(), src0.type() ); _dst.create( src0.size(), src0.type() );
Mat dst = _dst.getMat(); Mat dst = _dst.getMat();
src0.copyTo(dst); src0.copyTo(dst);
return; return;
} }
bool use_opencl = ocl::useOpenCL() && _dst.isUMat(); bool use_opencl = ocl::useOpenCL() && _dst.isUMat();
// if ( use_opencl && ocl_medianFilter(_src0,_dst, ksize)) if ( use_opencl && ocl_medianFilter(_src0,_dst, ksize))
if (use_opencl) return;
{ CV_Assert (ocl_medianFilter(_src0,_dst,ksize));
return;}
Mat src0 = _src0.getMat(); Mat src0 = _src0.getMat();
_dst.create( src0.size(), src0.type() ); _dst.create( src0.size(), src0.type() );
Mat dst = _dst.getMat(); Mat dst = _dst.getMat();