Merge topic 'FixVnlMinSLIC'

blowekamp · kwrobot · commit c95b99852a91 · 2018-06-25T10:00:03.000-04:00
8ec36b2 COMP: Use std::min over vnl_math_min
diff --git a/Modules/Segmentation/SuperPixel/include/itkSLICImageFilter.hxx b/Modules/Segmentation/SuperPixel/include/itkSLICImageFilter.hxx
@@ -134,7 +134,7 @@ SLICImageFilter<TInputImage, TOutputImage, TDistancePixel>
 
   if ( ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() != 0 )
     {
-    numberOfThreads = vnl_math_min(
+    numberOfThreads = std::min(
       this->GetNumberOfThreads(), ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() );
     }
 
@@ -380,7 +380,7 @@ SLICImageFilter<TInputImage, TOutputImage, TDistancePixel>
 
   if ( ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() != 0 )
     {
-    numberOfThreads = vnl_math_min(
+    numberOfThreads = std::min(
       this->GetNumberOfThreads(), ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() );
     }
 
@@ -510,7 +510,7 @@ SLICImageFilter<TInputImage, TOutputImage, TDistancePixel>
 
   if ( ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() != 0 )
     {
-    numberOfThreads = vnl_math_min(
+    numberOfThreads = std::min(
       this->GetNumberOfThreads(), ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ SLICImageFilter<TInputImage, TOutputImage, TDistancePixel>`
`134`	`134`
`135`	`135`	`if ( ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() != 0 )`
`136`	`136`	`{`
`137`		`- numberOfThreads = vnl_math_min(`
	`137`	`+ numberOfThreads = std::min(`
`138`	`138`	`this->GetNumberOfThreads(), ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() );`
`139`	`139`	`}`
`140`	`140`
`@@ -380,7 +380,7 @@ SLICImageFilter<TInputImage, TOutputImage, TDistancePixel>`
`380`	`380`
`381`	`381`	`if ( ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() != 0 )`
`382`	`382`	`{`
`383`		`- numberOfThreads = vnl_math_min(`
	`383`	`+ numberOfThreads = std::min(`
`384`	`384`	`this->GetNumberOfThreads(), ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() );`
`385`	`385`	`}`
`386`	`386`
`@@ -510,7 +510,7 @@ SLICImageFilter<TInputImage, TOutputImage, TDistancePixel>`
`510`	`510`
`511`	`511`	`if ( ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() != 0 )`
`512`	`512`	`{`
`513`		`- numberOfThreads = vnl_math_min(`
	`513`	`+ numberOfThreads = std::min(`
`514`	`514`	`this->GetNumberOfThreads(), ProcessObject::MultiThreaderType::GetGlobalMaximumNumberOfThreads() );`
`515`	`515`	`}`
`516`	`516`