Fixed getNumThreads() for C=
This commit is contained in:
parent
da1ddc752b
commit
6deda2531c
@ -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();
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user