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

Merge pull request #2594 from arkunze:pullreq/140319-dll-shutdown-fix-b

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-04-09 14:25:12 +04:00 committed by OpenCV Buildbot
commit ced81b9121
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/ocl.cpp
View File

@ -1581,7 +1581,7 @@ void finish()
#define IMPLEMENT_REFCOUNTABLE() \ #define IMPLEMENT_REFCOUNTABLE() \
void addref() { CV_XADD(&refcount, 1); } \ void addref() { CV_XADD(&refcount, 1); } \
void release() { if( CV_XADD(&refcount, -1) == 1 ) delete this; } \ void release() { if( CV_XADD(&refcount, -1) == 1 && !cv::__termination) delete this; } \
int refcount int refcount
/////////////////////////////////////////// Platform ///////////////////////////////////////////// /////////////////////////////////////////// Platform /////////////////////////////////////////////

14
modules/core/src/system.cpp
View File

@ -918,16 +918,22 @@ public:
#pragma warning(disable:4447) // Disable warning 'main' signature found without threading model #pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
#endif #endif
BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID); extern "C"
BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID lpReserved) BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID lpReserved)
{ {
if (fdwReason == DLL_THREAD_DETACH || fdwReason == DLL_PROCESS_DETACH) if (fdwReason == DLL_THREAD_DETACH || fdwReason == DLL_PROCESS_DETACH)
{ {
if (lpReserved != NULL) // called after ExitProcess() call if (lpReserved != NULL) // called after ExitProcess() call
{
cv::__termination = true; cv::__termination = true;
cv::deleteThreadAllocData(); }
cv::deleteThreadData(); else
{
// Not allowed to free resources if lpReserved is non-null
// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682583.aspx
cv::deleteThreadAllocData();
cv::deleteThreadData();
}
} }
return TRUE; return TRUE;
} }