Merge pull request #16779 from saskatchewancatch:issue-16777

* Fixes issue 16777. * core: update Concurrency getNumThreads()
5 years ago · 3b2e409fa7
parent 1c2ed2876f
commit 3b2e409fa7
1 changed files with 2 additions and 2 deletions
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@ -618,9 +618,9 @@ int getNumThreads(void)

 #elif defined HAVE_CONCURRENCY

-    return 1 + (pplScheduler == 0
+    return (pplScheduler == 0)
        ? Concurrency::CurrentScheduler::Get()->GetNumberOfVirtualProcessors()
-        : pplScheduler->GetNumberOfVirtualProcessors());
+        : (1 + pplScheduler->GetNumberOfVirtualProcessors());

 #elif defined HAVE_PTHREADS_PF