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

Remove clReleaseDevice call (workaround for pure virtual call on Windows)

Browse Source
This commit is contained in:
Alexander Karsakov 2014-03-05 17:57:06 +04:00
parent ba4513503e
commit 4aa891e773
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/ocl/src/cl_context.cpp
View File

@ -596,9 +596,16 @@ protected:
CV_Assert(this != currentContext); CV_Assert(this != currentContext);
#ifdef CL_VERSION_1_2 #ifdef CL_VERSION_1_2
if (supportsFeature(FEATURE_CL_VER_1_2)) #ifdef WIN32
// if process is on termination stage (ExitProcess was called and other threads were terminated)
// then disable command queue release because it may cause program hang
if (!__termination)
#endif
{ {
openCLSafeCall(clReleaseDevice(clDeviceID)); if (supportsFeature(FEATURE_CL_VER_1_2))
{
openCLSafeCall(clReleaseDevice(clDeviceID));
}
} }
#endif #endif
if (deviceInfoImpl._id < 0) // not in the global registry, so we should cleanup it if (deviceInfoImpl._id < 0) // not in the global registry, so we should cleanup it