Fixed some dubious uses of tbb::task_scheduler_init.
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 15 Aug 2013 15:54:00 +0000 (19:54 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Thu, 5 Sep 2013 15:03:00 +0000 (19:03 +0400)
modules/calib3d/perf/perf_pnp.cpp
modules/calib3d/test/test_solvepnp_ransac.cpp

index e881557..7a7acb0 100644 (file)
@@ -130,7 +130,7 @@ PERF_TEST_P(PointsNum, DISABLED_SolvePnPRansac, testing::Values(4, 3*9, 7*13))
 
 #ifdef HAVE_TBB
     // limit concurrency to get determenistic result
-    cv::Ptr<tbb::task_scheduler_init> one_thread = new tbb::task_scheduler_init(1);
+    tbb::task_scheduler_init one_thread(1);
 #endif
 
     TEST_CYCLE()
index 4d00d80..ae744a4 100644 (file)
@@ -276,7 +276,7 @@ TEST(DISABLED_Calib3d_SolvePnPRansac, concurrency)
     {
         // limit concurrency to get determenistic result
         cv::theRNG().state = 20121010;
-        cv::Ptr<tbb::task_scheduler_init> one_thread = new tbb::task_scheduler_init(1);
+        tbb::task_scheduler_init one_thread(1);
         solvePnPRansac(object, image, camera_mat, dist_coef, rvec1, tvec1);
     }
 
@@ -295,7 +295,7 @@ TEST(DISABLED_Calib3d_SolvePnPRansac, concurrency)
     {
         // single thread again
         cv::theRNG().state = 20121010;
-        cv::Ptr<tbb::task_scheduler_init> one_thread = new tbb::task_scheduler_init(1);
+        tbb::task_scheduler_init one_thread(1);
         solvePnPRansac(object, image, camera_mat, dist_coef, rvec2, tvec2);
     }