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

Temporarily disable command queue release as it causes program hang at exit

Browse Source
This commit is contained in:
peng xiao 2013-06-27 10:20:21 +08:00
parent 381057eaad
commit b2da1cdcc2
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/ocl/src/initialization.cpp
View File

@ -198,7 +198,8 @@ namespace cv
if(clCmdQueue) if(clCmdQueue)
{ {
openCLSafeCall(clReleaseCommandQueue(clCmdQueue)); //temporarily disable command queue release as it causes program hang at exit
//openCLSafeCall(clReleaseCommandQueue(clCmdQueue));
clCmdQueue = 0; clCmdQueue = 0;
} }
@ -1075,26 +1076,3 @@ namespace cv
}//namespace ocl }//namespace ocl
}//namespace cv }//namespace cv
#if defined BUILD_SHARED_LIBS && defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
#include <windows.h>
BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID );
BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID )
{
if( fdwReason == DLL_PROCESS_DETACH )
{
// application hangs if call clReleaseCommandQueue here, so release context only
// without context release application hangs as well
context_tear_down = 1;
Context* cv_ctx = Context::getContext();
if(cv_ctx)
{
cl_context ctx = cv_ctx->impl->oclcontext;
if(ctx)
openCLSafeCall(clReleaseContext(ctx));
}
}
return TRUE;
}
#endif