Minor perf tests framework improvement

diff --git a/modules/ts/include/opencv2/ts/ts_perf.hpp b/modules/ts/include/opencv2/ts/ts_perf.hpp
index 3f64fdc..5f8a816 100644 (file)
--- a/modules/ts/include/opencv2/ts/ts_perf.hpp
+++ b/modules/ts/include/opencv2/ts/ts_perf.hpp
@@ -287,7 +287,7 @@ private:
 \r
         _declareHelper& iterations(int n);\r
         _declareHelper& time(double timeLimitSecs);\r
-        _declareHelper& tbb_threads(int n);\r
+        _declareHelper& tbb_threads(int n = -1);\r
     private:\r
         TestBase* test;\r
         _declareHelper(TestBase* t);\r

diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp
index 5c1812b..b55a347 100644 (file)
--- 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)\r
 {\r
 #ifdef HAVE_TBB\r
-    if (n > 0) {\r
-        test->p_tbb_initializer.release();\r
+    test->p_tbb_initializer.release();\r
+    if (n > 0)\r
         test->p_tbb_initializer=new tbb::task_scheduler_init(n);\r
-    }\r
 #endif\r
     return *this;\r
 }\r