Merge pull request InsightSoftwareConsortium#5848 from N-Dekker/Use-ImageRegionIterators-without-Index

Author: dzenanz

Modules/Core/SpatialObjects/include/itkMetaImageConverter.hxx

@@ -19,7 +19,6 @@
 #define itkMetaImageConverter_hxx
 
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionIteratorWithIndex.h"
 #include "itkMath.h"
 
 namespace itk
@@ -105,7 +104,7 @@ MetaImageConverter<VDimension, PixelType, TSpatialObjectType>::MetaObjectToSpati
 
   this->MetaObjectToSpatialObjectBase(imageMO, imageSO);
 
-  ImageRegionIteratorWithIndex<ImageType> it(myImage, myImage->GetLargestPossibleRegion());
+  ImageRegionIterator<ImageType> it(myImage, myImage->GetLargestPossibleRegion());
   for (unsigned int i = 0; !it.IsAtEnd(); i++, ++it)
   {
     it.Set(static_cast<typename ImageType::PixelType>(imageMO->ElementData(i)));

Modules/Filtering/DiffusionTensorImage/test/itkTensorFractionalAnisotropyImageFilterTest.cxx

@@ -19,6 +19,7 @@
 #include "itkHessianRecursiveGaussianImageFilter.h"
 #include "itkTensorFractionalAnisotropyImageFilter.h"
 #include "itkDiffusionTensor3D.h"
+#include "itkImageRegionIteratorWithIndex.h"
 #include "itkTestingMacros.h"
 
 

Modules/Filtering/DiffusionTensorImage/test/itkTensorRelativeAnisotropyImageFilterTest.cxx

@@ -19,6 +19,7 @@
 #include "itkHessianRecursiveGaussianImageFilter.h"
 #include "itkTensorRelativeAnisotropyImageFilter.h"
 #include "itkDiffusionTensor3D.h"
+#include "itkImageRegionIteratorWithIndex.h"
 #include "itkTestingMacros.h"
 
 

Modules/Filtering/ImageFeature/include/itkHessianRecursiveGaussianImageFilter.hxx

@@ -18,6 +18,7 @@
 #ifndef itkHessianRecursiveGaussianImageFilter_hxx
 #define itkHessianRecursiveGaussianImageFilter_hxx
 
+#include "itkImageRegionIterator.h"
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkProgressAccumulator.h"
 #include <algorithm> // For generate.
@@ -285,7 +286,7 @@ HessianRecursiveGaussianImageFilter<TInputImage, TOutputImage>::GenerateData()
       // on the output image of vectors
       m_ImageAdaptor->SelectNthElement(element++);
 
-      ImageRegionIteratorWithIndex<RealImageType> it(derivativeImage, derivativeImage->GetRequestedRegion());
+      ImageRegionIterator<RealImageType> it(derivativeImage, derivativeImage->GetRequestedRegion());
 
       ImageRegionIteratorWithIndex<OutputImageAdaptorType> ot(m_ImageAdaptor, m_ImageAdaptor->GetRequestedRegion());
 

Modules/Filtering/ImageFeature/include/itkHoughTransform2DLinesImageFilter.hxx

@@ -18,7 +18,7 @@
 #ifndef itkHoughTransform2DLinesImageFilter_hxx
 #define itkHoughTransform2DLinesImageFilter_hxx
 
-#include "itkImageRegionIteratorWithIndex.h"
+#include "itkImageRegionIterator.h"
 #include "itkDiscreteGaussianImageFilter.h"
 #include "itkMinimumMaximumImageCalculator.h"
 #include "itkCastImageFilter.h"
@@ -196,9 +196,9 @@ HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>::Simplify()
     ++image_it;
   }
 
-  ImageRegionConstIteratorWithIndex<OutputImageType> accusimple_it(m_SimplifyAccumulator,
-                                                                   m_SimplifyAccumulator->GetRequestedRegion());
-  ImageRegionIteratorWithIndex<OutputImageType>      accu_it(outputImage, outputImage->GetRequestedRegion());
+  ImageRegionConstIterator<OutputImageType> accusimple_it(m_SimplifyAccumulator,
+                                                          m_SimplifyAccumulator->GetRequestedRegion());
+  ImageRegionIterator<OutputImageType>      accu_it(outputImage, outputImage->GetRequestedRegion());
 
   while (!accusimple_it.IsAtEnd())
   {

Modules/Filtering/ImageFeature/test/itkGradientVectorFlowImageFilterTest.cxx

@@ -20,6 +20,7 @@
 #include "itkGradientImageFilter.h"
 #include "itkVectorMagnitudeImageFilter.h"
 #include "itkGradientVectorFlowImageFilter.h"
+#include "itkImageRegionIteratorWithIndex.h"
 #include "itkTestingMacros.h"
 
 int

Modules/Filtering/ImageFeature/test/itkHessian3DToVesselnessMeasureImageFilterTest.cxx

@@ -18,6 +18,7 @@
 
 #include "itkHessianRecursiveGaussianImageFilter.h"
 #include "itkHessian3DToVesselnessMeasureImageFilter.h"
+#include "itkImageRegionIteratorWithIndex.h"
 #include "itkTestingMacros.h"
 
 

Modules/Filtering/ImageFeature/test/itkHessianRecursiveGaussianFilterScaleSpaceTest.cxx

@@ -17,6 +17,7 @@
  *=========================================================================*/
 
 #include "itkHessianRecursiveGaussianImageFilter.h"
+#include "itkImageRegionIteratorWithIndex.h"
 
 // This test creates an image varying as a 1D Gaussian in the X direction
 // for different values of sigma, and checks the scale-space response of

Modules/Filtering/ImageFeature/test/itkHessianRecursiveGaussianFilterTest.cxx

@@ -17,6 +17,7 @@
  *=========================================================================*/
 #include "itkHessianRecursiveGaussianImageFilter.h"
 #include "itkSimpleFilterWatcher.h"
+#include "itkImageRegionIteratorWithIndex.h"
 #include "itkTestingMacros.h"
 
 int

Modules/Filtering/ImageGradient/include/itkGradientRecursiveGaussianImageFilter.hxx

@@ -239,7 +239,7 @@ GradientRecursiveGaussianImageFilter<TInputImage, TOutputImage>::GenerateData()
       // on the output image of vectors
       m_ImageAdaptor->SelectNthElement(nc * ImageDimension + dim);
 
-      ImageRegionIteratorWithIndex<RealImageType> it(derivativeImage, derivativeImage->GetRequestedRegion());
+      ImageRegionIterator<RealImageType> it(derivativeImage, derivativeImage->GetRequestedRegion());
 
       ImageRegionIteratorWithIndex<OutputImageAdaptorType> ot(m_ImageAdaptor, m_ImageAdaptor->GetRequestedRegion());