generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed getNumThreads() for C=

Browse Source
This commit is contained in:
Daniil Osokin 2013-02-04 17:34:18 +04:00
parent da1ddc752b
commit 6deda2531c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/src/parallel.cpp
View File

@ -305,7 +305,9 @@ int cv::getNumThreads(void)
#elif defined HAVE_CSTRIPES #elif defined HAVE_CSTRIPES
return cv::getNumberOfCPUs(); return numThreads > 0
? numThreads
: cv::getNumberOfCPUs();
#elif defined HAVE_OPENMP #elif defined HAVE_OPENMP
@ -491,4 +493,4 @@ CV_IMPL int cvGetNumThreads()
CV_IMPL int cvGetThreadNum() CV_IMPL int cvGetThreadNum()
{ {
return cv::getThreadNum(); return cv::getThreadNum();
} }