From 3b2e409fa7f4d6319242da85b434d9b0ff8d996f Mon Sep 17 00:00:00 2001 From: RAJKIRAN NATARAJAN Date: Mon, 16 Mar 2020 07:12:29 -0700 Subject: [PATCH] Merge pull request #16779 from saskatchewancatch:issue-16777 * Fixes issue 16777. * core: update Concurrency getNumThreads() --- modules/core/src/parallel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp index 1b53cfa..3d02d74 100644 --- 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 -- 2.7.4