Merge pull request #51 from InsightSoftwareConsortium/ITKv5

ENH: Providing ITKv5 updates for C++11

Author: hjmjohnson

include/itkCoocurrenceTextureFeaturesImageFilter.h

@@ -208,7 +208,7 @@ class ITK_TEMPLATE_EXPORT CoocurrenceTextureFeaturesImageFilter
   typedef typename NeighborhoodIteratorType::NeighborIndexType             NeighborIndexType;
 
   CoocurrenceTextureFeaturesImageFilter();
-  virtual ~CoocurrenceTextureFeaturesImageFilter() {}
+  ~CoocurrenceTextureFeaturesImageFilter() override {}
 
   bool IsInsideNeighborhood(const OffsetType &iteratedOffset);
   void ComputeFeatures(const vnl_matrix<unsigned int> &hist, const unsigned int totalNumberOfFreq,
@@ -219,14 +219,14 @@ class ITK_TEMPLATE_EXPORT CoocurrenceTextureFeaturesImageFilter
                                 double & marginalMean,
                                 double & marginalDevSquared,
                                 double & pixelVariance);
-  virtual void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE;
+  void PrintSelf( std::ostream & os, Indent indent ) const override;
 
   /** This method causes the filter to generate its output. */
-  virtual void BeforeThreadedGenerateData() ITK_OVERRIDE;
-  virtual void AfterThreadedGenerateData() ITK_OVERRIDE;
-  virtual void ThreadedGenerateData(const OutputRegionType & outputRegionForThread,
-                                    ThreadIdType threadId) ITK_OVERRIDE;
-  virtual void GenerateOutputInformation() ITK_OVERRIDE;
+  void BeforeThreadedGenerateData() override;
+  void AfterThreadedGenerateData() override;
+  void ThreadedGenerateData(const OutputRegionType & outputRegionForThread,
+                                    ThreadIdType threadId) override;
+  void GenerateOutputInformation() override;
 
 private:
   typename DigitizedImageType::Pointer  m_DigitizedInputImage;

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;
 }
 
 

include/itkFirstOrderTextureFeaturesImageFilter.h

@@ -93,7 +93,7 @@ class ITK_TEMPLATE_EXPORT FirstOrderTextureFeaturesImageFilter:
   {
   }
 
-  void GenerateOutputInformation()
+  void GenerateOutputInformation() override
   {
     // this methods is overloaded so that if the output image is a
     // VectorImage then the correct number of components are set.
@@ -112,7 +112,7 @@ class ITK_TEMPLATE_EXPORT FirstOrderTextureFeaturesImageFilter:
   }
 
 
-  ~FirstOrderTextureFeaturesImageFilter() {}
+  ~FirstOrderTextureFeaturesImageFilter() override {}
 private:
   FirstOrderTextureFeaturesImageFilter(const Self &); //purposely not implemented
   void operator=(const Self &);                  //purposely not implemented

include/itkRunLengthTextureFeaturesImageFilter.h

@@ -232,7 +232,7 @@ class ITK_TEMPLATE_EXPORT RunLengthTextureFeaturesImageFilter
   typedef typename NeighborhoodIteratorType::NeighborIndexType             NeighborIndexType;
 
   RunLengthTextureFeaturesImageFilter();
-  virtual ~RunLengthTextureFeaturesImageFilter() {}
+  ~RunLengthTextureFeaturesImageFilter() override {}
 
   void NormalizeOffsetDirection(OffsetType &offset);
   bool IsInsideNeighborhood(const OffsetType &iteratedOffset);
@@ -241,14 +241,14 @@ class ITK_TEMPLATE_EXPORT RunLengthTextureFeaturesImageFilter
                           const OffsetType &offset, const unsigned int &pixelDistance);
   void ComputeFeatures( vnl_matrix<unsigned int> &hist, const unsigned int &totalNumberOfRuns,
                        typename TOutputImage::PixelType &outputPixel);
-  virtual void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE;
+  void PrintSelf( std::ostream & os, Indent indent ) const override;
 
   /** This method causes the filter to generate its output. */
-  virtual void BeforeThreadedGenerateData() ITK_OVERRIDE;
-  virtual void AfterThreadedGenerateData() ITK_OVERRIDE;
-  virtual void ThreadedGenerateData(const OutputRegionType & outputRegionForThread,
-                                    ThreadIdType threadId) ITK_OVERRIDE;
-  virtual void GenerateOutputInformation() ITK_OVERRIDE;
+  void BeforeThreadedGenerateData() override;
+  void AfterThreadedGenerateData() override;
+  void ThreadedGenerateData(const OutputRegionType & outputRegionForThread,
+                                    ThreadIdType threadId) override;
+  void GenerateOutputInformation() override;
 
 private:
   typename DigitizedImageType::Pointer  m_DigitizedInputImage;

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;
 }