From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu, 15 Aug 2013 15:54:00 +0000 (+0400)
Subject: Fixed some dubious uses of tbb::task_scheduler_init.
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~3779^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7d2fdc4b2628c725cee9ead0a5080a0a729762c;p=platform%2Fupstream%2Fopencv.git

Fixed some dubious uses of tbb::task_scheduler_init.
---

diff --git a/modules/calib3d/perf/perf_pnp.cpp b/modules/calib3d/perf/perf_pnp.cpp
index e881557..7a7acb0 100644
--- a/modules/calib3d/perf/perf_pnp.cpp
+++ b/modules/calib3d/perf/perf_pnp.cpp
@@ -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()
diff --git a/modules/calib3d/test/test_solvepnp_ransac.cpp b/modules/calib3d/test/test_solvepnp_ransac.cpp
index 4d00d80..ae744a4 100644
--- a/modules/calib3d/test/test_solvepnp_ransac.cpp
+++ b/modules/calib3d/test/test_solvepnp_ransac.cpp
@@ -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);
     }