Fixed getNumThreads() for C=

pull/401/head
Daniil Osokin 12 years ago
parent da1ddc752b
commit 6deda2531c
  1. 6
      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();
}
}

Loading…
Cancel
Save