Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup

11 years ago · f9fe1b9b09
parent a55cc60136 5a309e8f6e
commit f9fe1b9b09
1 changed files with 10 additions and 5 deletions
--- a/modules/ocl/src/fft.cpp
+++ b/modules/ocl/src/fft.cpp
@ -133,16 +133,21 @@ void cv::ocl::fft_setup()
 void cv::ocl::fft_teardown()
 {
    PlanCache& pCache = *PlanCache::getPlanCache();
+
    if(!pCache.started)
-    {
        return;
-    }
+
    for(size_t i = 0; i < pCache.planStore.size(); i ++)
-    {
        delete pCache.planStore[i];
-    }
    pCache.planStore.clear();
-    openCLSafeCall( clAmdFftTeardown( ) );
+
+    try
+    {
+        openCLSafeCall( clAmdFftTeardown( ) );
+    }
+    catch (const std::bad_alloc &)
+    { }
+
    delete pCache.setupData; pCache.setupData = NULL;
    pCache.started = false;
 }