From 6deda2531c8eb1d30a198ec6b4cdf54558731a6f Mon Sep 17 00:00:00 2001 From: Daniil Osokin Date: Mon, 4 Feb 2013 17:34:18 +0400 Subject: [PATCH] Fixed getNumThreads() for C= --- modules/core/src/parallel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp index 2bc8a05..0b2a845 100644 --- a/modules/core/src/parallel.cpp +++ b/modules/core/src/parallel.cpp @@ -305,7 +305,9 @@ int cv::getNumThreads(void) #elif defined HAVE_CSTRIPES - return cv::getNumberOfCPUs(); + return numThreads > 0 + ? numThreads + : cv::getNumberOfCPUs(); #elif defined HAVE_OPENMP @@ -491,4 +493,4 @@ CV_IMPL int cvGetNumThreads() CV_IMPL int cvGetThreadNum() { return cv::getThreadNum(); -} \ No newline at end of file +} -- 2.7.4