Merge pull request #16779 from saskatchewancatch:issue-16777

* Fixes issue 16777. * core: update Concurrency getNumThreads()

Merge pull request #16779 from saskatchewancatch:issue-16777
* Fixes issue 16777. * core: update Concurrency getNumThreads()
3b2e409f · RAJKIRAN NATARAJAN · GitHub · 1c2ed287 · 3b2e409f
Unverified Commit 3b2e409f authored Mar 16, 2020 by RAJKIRAN NATARAJAN Committed by GitHub Mar 16, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

parallel.cpp modules/core/src/parallel.cpp +2 -2

No files found.
--- 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