From 41d3a9a19257cc6263ca2e2fcb4c31f50ca2adbd Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Tue, 1 Nov 2011 08:13:30 +0000
Subject: [PATCH] Minor perf tests framework improvement

---
 modules/ts/include/opencv2/ts/ts_perf.hpp | 2 +-
 modules/ts/src/ts_perf.cpp                | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/ts/include/opencv2/ts/ts_perf.hpp b/modules/ts/include/opencv2/ts/ts_perf.hpp
index 3f64fdc..5f8a816 100644
--- a/modules/ts/include/opencv2/ts/ts_perf.hpp
+++ b/modules/ts/include/opencv2/ts/ts_perf.hpp
@@ -287,7 +287,7 @@ private:
 
         _declareHelper& iterations(int n);
         _declareHelper& time(double timeLimitSecs);
-        _declareHelper& tbb_threads(int n);
+        _declareHelper& tbb_threads(int n = -1);
     private:
         TestBase* test;
         _declareHelper(TestBase* t);
diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp
index 5c1812b..b55a347 100644
--- a/modules/ts/src/ts_perf.cpp
+++ b/modules/ts/src/ts_perf.cpp
@@ -898,10 +898,9 @@ TestBase::_declareHelper& TestBase::_declareHelper::time(double timeLimitSecs)
 TestBase::_declareHelper& TestBase::_declareHelper::tbb_threads(int n)
 {
 #ifdef HAVE_TBB
-    if (n > 0) {
-        test->p_tbb_initializer.release();
+    test->p_tbb_initializer.release();
+    if (n > 0)
         test->p_tbb_initializer=new tbb::task_scheduler_init(n);
-    }
 #endif
     return *this;
 }
-- 
2.7.4