From f6b758699be92a7d1c8433a509ecbb213dfbac55 Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Mon, 24 Aug 2015 19:21:37 +0300 Subject: [PATCH] Revert merging of pull request #5176 from vladimir-dudnik:master (reverted from commit 5ee00ec5c6b21debd461808f584accbe7c42c869) --- modules/core/src/ocl.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp index f3bdf16820..c51f90ad69 100644 --- a/modules/core/src/ocl.cpp +++ b/modules/core/src/ocl.cpp @@ -4572,16 +4572,13 @@ public: else { // 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_MAP_READ | CL_MAP_WRITE), - 0, u->size, 0, 0, 0, &retval); - CV_OclDbgAssert(retval == CL_SUCCESS); - CV_OclDbgAssert(clEnqueueUnmapMemObject(q, (cl_mem)u->handle, data, 0, 0, 0) == CL_SUCCESS); - CV_OclDbgAssert(clFinish(q) == CL_SUCCESS); - } + cl_int retval = 0; + void* data = clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE, + (CL_MAP_READ | CL_MAP_WRITE), + 0, u->size, 0, 0, 0, &retval); + CV_OclDbgAssert(retval == 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);