Merge pull request opencv#9968 from alalek:fix_9960

alalek · alalek · commit c6fc7ccb5ef6 · 2017-10-30T15:33:46.000Z
diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
@@ -3613,11 +3613,12 @@ class OpenCLAllocator : public MatAllocator
                         if (u->tempUMat())
                         {
                             CV_Assert(u->mapcount == 0);
+                            flushCleanupQueue(); // workaround for CL_OUT_OF_RESOURCES problem (#9960)
                             void* data = clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE,
                                 (CL_MAP_READ | CL_MAP_WRITE),
                                 0, u->size, 0, 0, 0, &retval);
+                            CV_Assert(retval == CL_SUCCESS);
                             CV_Assert(u->origdata == data);
-                            CV_OclDbgAssert(retval == CL_SUCCESS);
                             if (u->originalUMatData)
                             {
                                 CV_Assert(u->originalUMatData->data == data);

Original file line number	Diff line number	Diff line change
`@@ -3613,11 +3613,12 @@ class OpenCLAllocator : public MatAllocator`
`3613`	`3613`	`if (u->tempUMat())`
`3614`	`3614`	`{`
`3615`	`3615`	`CV_Assert(u->mapcount == 0);`
	`3616`	`+ flushCleanupQueue(); // workaround for CL_OUT_OF_RESOURCES problem (#9960)`
`3616`	`3617`	`void* data = clEnqueueMapBuffer(q, (cl_mem)u->handle, CL_TRUE,`
`3617`	`3618`	`(CL_MAP_READ \| CL_MAP_WRITE),`
`3618`	`3619`	`0, u->size, 0, 0, 0, &retval);`
	`3620`	`+ CV_Assert(retval == CL_SUCCESS);`
`3619`	`3621`	`CV_Assert(u->origdata == data);`
`3620`		`- CV_OclDbgAssert(retval == CL_SUCCESS);`
`3621`	`3622`	`if (u->originalUMatData)`
`3622`	`3623`	`{`
`3623`	`3624`	`CV_Assert(u->originalUMatData->data == data);`