Merge branch 'release-5.4'

Author: thewtex

Modules/Core/Common/src/itkMultiThreaderBase.cxx

@@ -221,8 +221,8 @@ MultiThreaderBase::SetGlobalMaximumNumberOfThreads(ThreadIdType val)
   m_PimplGlobals->m_GlobalMaximumNumberOfThreads = std::clamp<ThreadIdType>(val, 1, ITK_MAX_THREADS);
 
   // If necessary reset the default to be used from now on.
-  m_PimplGlobals->m_GlobalDefaultNumberOfThreads =
-    std::min(m_PimplGlobals->m_GlobalDefaultNumberOfThreads, m_PimplGlobals->m_GlobalMaximumNumberOfThreads);
+  MultiThreaderBase::SetGlobalDefaultNumberOfThreads(
+    std::min(Self::GetGlobalDefaultNumberOfThreads(), Self::GetGlobalMaximumNumberOfThreads()));
 }
 
 ThreadIdType

Modules/Core/Common/test/itkMultiThreaderBaseTest.cxx

@@ -103,6 +103,12 @@ SetAndVerify(int number)
 int
 itkMultiThreaderBaseTest(int argc, char * argv[])
 {
+  bool result = true;
+
+  itk::MultiThreaderBase::SetGlobalMaximumNumberOfThreads(1);
+  result &= itk::MultiThreaderBase::GetGlobalMaximumNumberOfThreads() == 1;
+  result &= itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads() == 1;
+
   // Choose a number of threads.
   int numberOfThreads = 10;
   if (argc > 1)
@@ -114,13 +120,21 @@ itkMultiThreaderBaseTest(int argc, char * argv[])
     }
   }
 
-  bool result = true;
   TEST_SINGLE_CLASS(PlatformMultiThreader);
   TEST_SINGLE_CLASS(PoolMultiThreader);
 #ifdef ITK_USE_TBB
   TEST_SINGLE_CLASS(TBBMultiThreader);
 #endif
 
+
+  itk::MultiThreaderBase::SetGlobalMaximumNumberOfThreads(2);
+  result &= VerifyRange(
+    itk::MultiThreaderBase::GetGlobalMaximumNumberOfThreads(), 1, 2, "Range error in MaximumNumberOfThreads");
+  itk::MultiThreaderBase::SetGlobalDefaultNumberOfThreads(4);
+  result &= VerifyRange(
+    itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads(), 1, 2, "Range error in DefaultNumberOfThreads");
+
+
   itk::MultiThreaderBase::SetGlobalDefaultNumberOfThreads(numberOfThreads);
 
   result &= SetAndVerify(-1);
@@ -134,7 +148,6 @@ itkMultiThreaderBaseTest(int argc, char * argv[])
   result &= SetAndVerify(itk::MultiThreaderBase::GetGlobalMaximumNumberOfThreads() - 1);
   result &= SetAndVerify(itk::MultiThreaderBase::GetGlobalMaximumNumberOfThreads() + 1);
 
-
   // Test streaming enumeration for MultiThreaderBaseEnums::Threader elements
   const std::set<itk::MultiThreaderBaseEnums::Threader> allThreader{
     itk::MultiThreaderBaseEnums::Threader::Platform,