Fixed getNumThreads() for C=
authorDaniil Osokin <daniil.osokin@itseez.com>
Mon, 4 Feb 2013 13:34:18 +0000 (17:34 +0400)
committerDaniil Osokin <daniil.osokin@itseez.com>
Thu, 14 Feb 2013 13:07:36 +0000 (17:07 +0400)
modules/core/src/parallel.cpp

index 2bc8a05..0b2a845 100644 (file)
@@ -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
+}