Resolves bug #3450 (Improperly cleaning up resources in DllMain)

2014-03-24 13:38:57 -07:00
parent 5600bc54f4
commit 629ddf0bf8
2 changed files with 11 additions and 5 deletions
--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@@ -1581,7 +1581,7 @@ void finish()

 #define IMPLEMENT_REFCOUNTABLE() \
    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

 /////////////////////////////////////////// Platform /////////////////////////////////////////////