COMP: Use C++11 nullptr directly

hjmjohnson · hjmjohnson · commit b5a35ce30f45 · 2018-01-21T17:04:18.000-06:00
git grep -l "ITK_NULLPTR" |   fgrep -v itk_compiler_detection.h | fgrep -v CMakeLists.txt |fgrep -v .cmake |   xargs sed -i '' -e "s/ITK_NULLPTR/nullptr/g"
diff --git a/include/itkCoocurrenceTextureFeaturesImageFilter.hxx b/include/itkCoocurrenceTextureFeaturesImageFilter.hxx
@@ -98,7 +98,7 @@ CoocurrenceTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>
 
   typedef BinaryFunctorImageFilter< MaskImageType, InputImageType, DigitizedImageType, DigitizerFunctorType> FilterType;
   typename FilterType::Pointer filter = FilterType::New();
-  if (this->GetMaskImage() != ITK_NULLPTR)
+  if (this->GetMaskImage() != nullptr)
     {
     typename TMaskImage::Pointer mask = MaskImageType::New();
     mask->Graft(const_cast<TMaskImage *>(this->GetMaskImage()));
@@ -122,7 +122,7 @@ CoocurrenceTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>
 ::AfterThreadedGenerateData()
 {
   // Free internal image
-  this->m_DigitizedInputImage = ITK_NULLPTR;
+  this->m_DigitizedInputImage = nullptr;
 }
 
 
diff --git a/include/itkRunLengthTextureFeaturesImageFilter.hxx b/include/itkRunLengthTextureFeaturesImageFilter.hxx
@@ -99,7 +99,7 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>
 
   typedef BinaryFunctorImageFilter< MaskImageType, InputImageType, DigitizedImageType, DigitizerFunctorType> FilterType;
   typename FilterType::Pointer filter = FilterType::New();
-  if (this->GetMaskImage() != ITK_NULLPTR)
+  if (this->GetMaskImage() != nullptr)
     {
     typename TMaskImage::Pointer mask = MaskImageType::New();
     mask->Graft(const_cast<TMaskImage *>(this->GetMaskImage()));
@@ -126,7 +126,7 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>
 ::AfterThreadedGenerateData()
 {
   // free internal image
-  this->m_DigitizedInputImage = ITK_NULLPTR;
+  this->m_DigitizedInputImage = nullptr;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ CoocurrenceTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>`
`98`	`98`
`99`	`99`	`typedef BinaryFunctorImageFilter< MaskImageType, InputImageType, DigitizedImageType, DigitizerFunctorType> FilterType;`
`100`	`100`	`typename FilterType::Pointer filter = FilterType::New();`
`101`		`- if (this->GetMaskImage() != ITK_NULLPTR)`
	`101`	`+ if (this->GetMaskImage() != nullptr)`
`102`	`102`	`{`
`103`	`103`	`typename TMaskImage::Pointer mask = MaskImageType::New();`
`104`	`104`	`mask->Graft(const_cast<TMaskImage *>(this->GetMaskImage()));`
`@@ -122,7 +122,7 @@ CoocurrenceTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>`
`122`	`122`	`::AfterThreadedGenerateData()`
`123`	`123`	`{`
`124`	`124`	`// Free internal image`
`125`		`- this->m_DigitizedInputImage = ITK_NULLPTR;`
	`125`	`+ this->m_DigitizedInputImage = nullptr;`
`126`	`126`	`}`
`127`	`127`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>`
`99`	`99`
`100`	`100`	`typedef BinaryFunctorImageFilter< MaskImageType, InputImageType, DigitizedImageType, DigitizerFunctorType> FilterType;`
`101`	`101`	`typename FilterType::Pointer filter = FilterType::New();`
`102`		`- if (this->GetMaskImage() != ITK_NULLPTR)`
	`102`	`+ if (this->GetMaskImage() != nullptr)`
`103`	`103`	`{`
`104`	`104`	`typename TMaskImage::Pointer mask = MaskImageType::New();`
`105`	`105`	`mask->Graft(const_cast<TMaskImage *>(this->GetMaskImage()));`
`@@ -126,7 +126,7 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage, TMaskImage>`
`126`	`126`	`::AfterThreadedGenerateData()`
`127`	`127`	`{`
`128`	`128`	`// free internal image`
`129`		`- this->m_DigitizedInputImage = ITK_NULLPTR;`
	`129`	`+ this->m_DigitizedInputImage = nullptr;`
`130`	`130`	`}`
`131`	`131`
`132`	`132`