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

This commit is contained in:
Andrey Pavlenko
2015-08-24 19:21:37 +03:00
parent 4a067dca58
commit f6b758699b

View File

@@ -4572,8 +4572,6 @@ 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; cl_int retval = 0;
void* data = clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE, void* data = clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE,
(CL_MAP_READ | CL_MAP_WRITE), (CL_MAP_READ | CL_MAP_WRITE),
@@ -4583,7 +4581,6 @@ public:
CV_OclDbgAssert(clFinish(q) == CL_SUCCESS); CV_OclDbgAssert(clFinish(q) == CL_SUCCESS);
} }
} }
}
u->markHostCopyObsolete(false); u->markHostCopyObsolete(false);
} }
#ifdef HAVE_OPENCL_SVM #ifdef HAVE_OPENCL_SVM