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

trying to guess and fix strange failure in core test

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-12-01 22:14:15 +04:00
parent d7f4a223cf
commit f263fe145a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2719,17 +2719,17 @@ public:
cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr(); cl_command_queue q = (cl_command_queue)Queue::getDefault().ptr();
clFinish(q); clFinish(q);
UMatDataAutoLock lock(u);
if( u->hostCopyObsolete() && u->handle && if( u->hostCopyObsolete() && u->handle &&
u->tempCopiedUMat() && u->refcount > 0 && u->origdata) u->tempCopiedUMat() && u->refcount > 0 && u->origdata)
{ {
UMatDataAutoLock lock(u);
clEnqueueReadBuffer(q, (cl_mem)u->handle, CL_TRUE, 0, clEnqueueReadBuffer(q, (cl_mem)u->handle, CL_TRUE, 0,
u->size, u->origdata, 0, 0, 0); u->size, u->origdata, 0, 0, 0);
u->markHostCopyObsolete(false); u->markHostCopyObsolete(false);
} }
else if( u->copyOnMap() && u->deviceCopyObsolete() && u->data ) else if( u->copyOnMap() && u->deviceCopyObsolete() && u->data )
{ {
UMatDataAutoLock lock(u);
clEnqueueWriteBuffer(q, (cl_mem)u->handle, CL_TRUE, 0, clEnqueueWriteBuffer(q, (cl_mem)u->handle, CL_TRUE, 0,
u->size, u->data, 0, 0, 0); u->size, u->data, 0, 0, 0);
} }