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

Revert merging of pull request #5176 from vladimir-dudnik:master (reverted from commit 5ee00ec5c6)

Browse Source
This commit is contained in:
Andrey Pavlenko
2015-08-24 19:21:37 +03:00
parent 4a067dca58
commit f6b758699b
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4572,16 +4572,13 @@ public:
else else
{ {
// CL_MEM_USE_HOST_PTR (nothing is required) and OTHER cases // CL_MEM_USE_HOST_PTR (nothing is required) and OTHER cases
if (u->flags & UMatData::USER_ALLOCATED) cl_int retval = 0;
{ void* data = clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE,
cl_int retval = 0; (CL_MAP_READ | CL_MAP_WRITE),
void* data = clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE, 0, u->size, 0, 0, 0, &retval);
(CL_MAP_READ | CL_MAP_WRITE), CV_OclDbgAssert(retval == CL_SUCCESS);
0, u->size, 0, 0, 0, &retval); CV_OclDbgAssert(clEnqueueUnmapMemObject(q, (cl_mem)u->handle, data, 0, 0, 0) == CL_SUCCESS);
CV_OclDbgAssert(retval == CL_SUCCESS); CV_OclDbgAssert(clFinish(q) == CL_SUCCESS);
CV_OclDbgAssert(clEnqueueUnmapMemObject(q, (cl_mem)u->handle, data, 0, 0, 0) == CL_SUCCESS);
CV_OclDbgAssert(clFinish(q) == CL_SUCCESS);
}
} }
} }
u->markHostCopyObsolete(false); u->markHostCopyObsolete(false);