projects
/
profile
/
ivi
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed getNumThreads() for C=
[profile/ivi/opencv.git]
/
modules
/
core
/
src
/
parallel.cpp
diff --git
a/modules/core/src/parallel.cpp
b/modules/core/src/parallel.cpp
index
2bc8a05
..
0b2a845
100644
(file)
--- a/
modules/core/src/parallel.cpp
+++ b/
modules/core/src/parallel.cpp
@@
-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()
{
return cv::getThreadNum();
CV_IMPL int cvGetThreadNum()
{
return cv::getThreadNum();
-}
\ No newline at end of file
+}