X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=modules%2Fcore%2Fsrc%2Fparallel.cpp;h=0b2a845ac1fb6136e63b467fb2df4b09339d550d;hb=6deda2531c8eb1d30a198ec6b4cdf54558731a6f;hp=2bc8a05880124584b91fc953cae7202a0d07a25e;hpb=da1ddc752b279e5068887197798b2897be08f49b;p=profile%2Fivi%2Fopencv.git 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 +}