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

async

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-01-30 00:19:18 +04:00
parent 6fa41c5a64
commit 6d64907f18
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/ocl.cpp
View File

@ -3299,7 +3299,7 @@ public:
CV_Assert(u->handle != 0 && u->urefcount == 0); CV_Assert(u->handle != 0 && u->urefcount == 0);
if(u->tempUMat()) if(u->tempUMat())
{ {
UMatDataAutoLock lock(u); // UMatDataAutoLock lock(u);
if( u->hostCopyObsolete() && u->refcount > 0 ) if( u->hostCopyObsolete() && u->refcount > 0 )
{ {
cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr(); cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr();

4
modules/imgproc/src/filter.cpp
View File

@ -3595,12 +3595,12 @@ static bool ocl_sepFilter2D( InputArray _src, OutputArray _dst, int ddepth,
Size srcSize = src.size(); Size srcSize = src.size();
Size bufSize(srcSize.width, srcSize.height + kernelY.cols - 1); Size bufSize(srcSize.width, srcSize.height + kernelY.cols - 1);
UMat buf; buf.create(bufSize, CV_MAKETYPE(CV_32F, cn)); UMat buf; buf.create(bufSize, CV_MAKETYPE(CV_32F, cn));
if (!ocl_sepRowFilter2D(src, buf, kernelX, anchor.x, borderType, true)) if (!ocl_sepRowFilter2D(src, buf, kernelX, anchor.x, borderType, false))
return false; return false;
_dst.create(srcSize, CV_MAKETYPE(ddepth, cn)); _dst.create(srcSize, CV_MAKETYPE(ddepth, cn));
UMat dst = _dst.getUMat(); UMat dst = _dst.getUMat();
return ocl_sepColFilter2D(buf, dst, kernelY, anchor.y, true); return ocl_sepColFilter2D(buf, dst, kernelY, anchor.y, false);
} }
#endif #endif