Fixed getNumThreads() for C=

6deda253 · Daniil Osokin · da1ddc75 · 6deda253
Commit 6deda253 authored Feb 04, 2013 by Daniil Osokin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

parallel.cpp modules/core/src/parallel.cpp +4 -3

No files found.
--- 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
+}