From 3ffe0f011712787436c0c62854d007bc984fbff8 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 15 Oct 2012 16:25:06 +0400 Subject: [PATCH] Remove unused tbb::task_scheduler_init from perf tests --- modules/ts/include/opencv2/ts/ts_perf.hpp | 5 ----- modules/ts/src/ts_perf.cpp | 3 --- 2 files changed, 8 deletions(-) diff --git a/modules/ts/include/opencv2/ts/ts_perf.hpp b/modules/ts/include/opencv2/ts/ts_perf.hpp index a50373444b..3b75ee9ee6 100644 --- a/modules/ts/include/opencv2/ts/ts_perf.hpp +++ b/modules/ts/include/opencv2/ts/ts_perf.hpp @@ -346,11 +346,6 @@ private: friend class _declareHelper; friend class Regression; -#ifdef HAVE_TBB - cv::Ptr p_tbb_initializer; -#else - cv::Ptr fixme; -#endif bool verified; public: diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp index 25bd1c538a..ee4783228d 100644 --- a/modules/ts/src/ts_perf.cpp +++ b/modules/ts/src/ts_perf.cpp @@ -1088,9 +1088,6 @@ void TestBase::TearDown() if (type_param) printf("[ TYPE ] \t%s\n", type_param), fflush(stdout); reportMetrics(true); } -#ifdef HAVE_TBB - p_tbb_initializer.release(); -#endif } std::string TestBase::getDataPath(const std::string& relativePath)