Merge pull request InsightSoftwareConsortium#5932 from N-Dekker/Use-CTAD-for-iterators-with-index

STYLE: Use CTAD for iterators "with index", in hxx files

Author: hjmjohnson

Modules/Core/Common/include/itkMinimumMaximumImageCalculator.hxx

@@ -32,7 +32,7 @@ MinimumMaximumImageCalculator<TInputImage>::Compute()
     m_Region = m_Image->GetRequestedRegion();
   }
 
-  ImageRegionConstIteratorWithIndex<TInputImage> it(m_Image, m_Region);
+  ImageRegionConstIteratorWithIndex it(m_Image, m_Region);
   m_Maximum = NumericTraits<PixelType>::NonpositiveMin();
   m_Minimum = NumericTraits<PixelType>::max();
 
@@ -61,7 +61,7 @@ MinimumMaximumImageCalculator<TInputImage>::ComputeMinimum()
   {
     m_Region = m_Image->GetRequestedRegion();
   }
-  ImageRegionConstIteratorWithIndex<TInputImage> it(m_Image, m_Region);
+  ImageRegionConstIteratorWithIndex it(m_Image, m_Region);
   m_Minimum = NumericTraits<PixelType>::max();
 
   while (!it.IsAtEnd())
@@ -84,7 +84,7 @@ MinimumMaximumImageCalculator<TInputImage>::ComputeMaximum()
   {
     m_Region = m_Image->GetRequestedRegion();
   }
-  ImageRegionConstIteratorWithIndex<TInputImage> it(m_Image, m_Region);
+  ImageRegionConstIteratorWithIndex it(m_Image, m_Region);
   m_Maximum = NumericTraits<PixelType>::NonpositiveMin();
 
   while (!it.IsAtEnd())

Modules/Core/ImageFunction/include/itkGaussianBlurImageFunction.hxx

@@ -231,8 +231,8 @@ GaussianBlurImageFunction<TInputImage, TOutput>::EvaluateAtIndex(const IndexType
   typename InternalImageType::RegionType regionS = region;
   regionS.Crop(inputImage->GetBufferedRegion());
 
-  ImageLinearConstIteratorWithIndex<InputImageType> it(inputImage, regionS);
-  ImageLinearIteratorWithIndex<InternalImageType>   itN(m_InternalImage, regionN);
+  ImageLinearConstIteratorWithIndex it(inputImage, regionS);
+  ImageLinearIteratorWithIndex      itN(m_InternalImage, regionN);
   it.SetDirection(1);
   itN.SetDirection(1);
   it.GoToBeginOfLine();
@@ -266,7 +266,7 @@ GaussianBlurImageFunction<TInputImage, TOutput>::EvaluateAtIndex(const IndexType
     m_OperatorInternalImageFunction->SetInputImage(m_InternalImage);
     m_OperatorInternalImageFunction->SetOperator(operatorArray[direction]);
 
-    ImageLinearIteratorWithIndex<InternalImageType> itr(m_InternalImage, region);
+    ImageLinearIteratorWithIndex itr(m_InternalImage, region);
 
     unsigned int dir = direction + 1;
     if (dir == Self::ImageDimension)

Modules/Core/Mesh/include/itkImageToParametricSpaceFilter.hxx

@@ -121,7 +121,7 @@ ImageToParametricSpaceFilter<TInputImage, TOutputMesh>::GenerateData()
   {
     PointDataContainerIterator data = pointData->Begin();
     image = this->GetInput(0);
-    ImageRegionConstIteratorWithIndex<InputImageType> itr(image, image->GetRequestedRegion());
+    ImageRegionConstIteratorWithIndex itr(image, image->GetRequestedRegion());
     while (!itr.IsAtEnd())
     {
       //  The data at each point is the index

Modules/Core/SpatialObjects/include/itkSpatialObjectToImageFilter.hxx

@@ -278,7 +278,7 @@ SpatialObjectToImageFilter<TInputSpatialObject, TOutputImage>::GenerateData()
   OutputImage->Allocate(); // allocate the image
 
 
-  ImageRegionIteratorWithIndex<OutputImageType> it(OutputImage, region);
+  ImageRegionIteratorWithIndex it(OutputImage, region);
 
   itk::Point<double, ObjectDimension>      objectPoint;
   itk::Point<double, OutputImageDimension> imagePoint;

Modules/Core/SpatialObjects/include/itkSpatialObjectToImageStatisticsCalculator.hxx

@@ -114,11 +114,11 @@ SpatialObjectToImageStatisticsCalculator<TInputImage, TInputSpatialObject, TSamp
 
     const typename MaskImageType::ConstPointer maskImage = maskSpatialObject->GetImage();
 
-    ImageRegionConstIteratorWithIndex<MaskImageType> it(maskImage, maskImage->GetLargestPossibleRegion());
-    IndexType                                        ind;
-    PointType                                        pnt;
-    PointType                                        tPnt;
-    VectorType                                       mv;
+    ImageRegionConstIteratorWithIndex it(maskImage, maskImage->GetLargestPossibleRegion());
+    IndexType                         ind;
+    PointType                         pnt;
+    PointType                         tPnt;
+    VectorType                        mv;
     while (!it.IsAtEnd())
     {
       if (it.Get() > 0) // if inside the mask
@@ -179,10 +179,10 @@ SpatialObjectToImageStatisticsCalculator<TInputImage, TInputSpatialObject, TSamp
 
     const RegionType region(indMin, size);
 
-    ImageRegionConstIteratorWithIndex<ImageType> it(m_Image, region);
-    IndexType                                    ind;
-    PointType                                    pnt;
-    VectorType                                   mv;
+    ImageRegionConstIteratorWithIndex it(m_Image, region);
+    IndexType                         ind;
+    PointType                         pnt;
+    VectorType                        mv;
     while (!it.IsAtEnd())
     {
       ind = it.GetIndex();

Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryDilateImageFilter.hxx

@@ -169,7 +169,7 @@ BinaryDilateImageFilter<TInputImage, TOutputImage, TKernel>::GenerateData()
   // because in that way we will take care carefully at boundary
   // pixels of output requested region.  Take care means that we will
   // check if a boundary pixel is or not a border pixel.
-  ImageRegionIteratorWithIndex<TempImageType> tmpRegIndexIt(tmpImage, tmpRequestedRegion);
+  ImageRegionIteratorWithIndex tmpRegIndexIt(tmpImage, tmpRequestedRegion);
 
   ConstNeighborhoodIterator<TempImageType> oNeighbIt(radius, tmpImage, tmpRequestedRegion);
 
@@ -383,7 +383,7 @@ BinaryDilateImageFilter<TInputImage, TOutputImage, TKernel>::GenerateData()
   auto                                              vecEndIt = this->KernelCCVectorEnd();
 
   // iterator on output image
-  ImageRegionIteratorWithIndex<OutputImageType> ouRegIndexIt(output, outputRegion);
+  ImageRegionIteratorWithIndex ouRegIndexIt(output, outputRegion);
 
   // InputRegionForThread is the output region for thread padded by
   // kernel radius We must traverse this padded region because some

Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryErodeImageFilter.hxx

@@ -159,7 +159,7 @@ BinaryErodeImageFilter<TInputImage, TOutputImage, TKernel>::GenerateData()
   // because in that way we will take care carefully at boundary
   // pixels of output requested region.  Take care means that we will
   // check if a boundary pixel is or not a border pixel.
-  ImageRegionIteratorWithIndex<TempImageType> tmpRegIndexIt(tmpImage, tmpRequestedRegion);
+  ImageRegionIteratorWithIndex tmpRegIndexIt(tmpImage, tmpRequestedRegion);
 
   ConstNeighborhoodIterator<TempImageType> oNeighbIt(radius, tmpImage, tmpRequestedRegion);
 
@@ -377,7 +377,7 @@ BinaryErodeImageFilter<TInputImage, TOutputImage, TKernel>::GenerateData()
   auto                                              vecEndIt = this->KernelCCVectorEnd();
 
   // iterator on output image
-  ImageRegionIteratorWithIndex<OutputImageType> ouRegIndexIt(output, outputRegion);
+  ImageRegionIteratorWithIndex ouRegIndexIt(output, outputRegion);
 
   // InputRegionForThread is the output region for thread padded by
   // kernel radius We must traverse this padded region because some

Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryMorphologyImageFilter.hxx

@@ -133,7 +133,7 @@ BinaryMorphologyImageFilter<TInputImage, TOutputImage, TKernel>::AnalyzeKernel()
 
   // Now look for connected component and record one SE element
   // position for each CC.
-  ImageRegionIteratorWithIndex<BoolImageType> kernelImageItIndex(tmpSEImage, tmpSEImage->GetRequestedRegion());
+  ImageRegionIteratorWithIndex kernelImageItIndex(tmpSEImage, tmpSEImage->GetRequestedRegion());
 
   // Neighborhood iterator on SE element temp image
   auto                                padBy = InputSizeType::Filled(1);

Modules/Filtering/Denoising/include/itkPatchBasedDenoisingImageFilter.hxx

@@ -477,8 +477,7 @@ PatchBasedDenoisingImageFilter<TInputImage, TOutputImage>::InitializePatchWeight
   auto centerIndex = WeightsImageType::IndexType::Filled(patchRadius);
 
   unsigned int pos = 0;
-  for (ImageRegionIteratorWithIndex<WeightsImageType> pwIt(physicalWeightsImage, physicalRegion); !pwIt.IsAtEnd();
-       ++pwIt)
+  for (ImageRegionIteratorWithIndex pwIt(physicalWeightsImage, physicalRegion); !pwIt.IsAtEnd(); ++pwIt)
   {
     typename WeightsImageType::IndexType curIndex = pwIt.GetIndex();
     // Compute distances of each pixel from center pixel

Modules/Filtering/DiffusionTensorImage/include/itkDiffusionTensor3DReconstructionImageFilter.hxx

@@ -197,7 +197,7 @@ DiffusionTensor3DReconstructionImageFilter<TReferenceImagePixelType,
   {
     const typename ReferenceImageType::Pointer refImage =
       static_cast<ReferenceImageType *>(this->ProcessObject::GetInput(0));
-    ImageRegionConstIteratorWithIndex<ReferenceImageType> it(refImage, outputRegionForThread);
+    ImageRegionConstIteratorWithIndex it(refImage, outputRegionForThread);
 
     using GradientIteratorType = ImageRegionConstIterator<GradientImageType>;
     std::vector<GradientIteratorType *> gradientItContainer;
@@ -308,7 +308,7 @@ DiffusionTensor3DReconstructionImageFilter<TReferenceImagePixelType,
     // The enum will ensure that an inappropriate cast is not done
     gradientImagePointer = itkDynamicCastInDebugMode<GradientImagesType *>(this->ProcessObject::GetInput(0));
 
-    ImageRegionConstIteratorWithIndex<GradientImagesType> git(gradientImagePointer, outputRegionForThread);
+    ImageRegionConstIteratorWithIndex git(gradientImagePointer, outputRegionForThread);
     git.GoToBegin();
 
     // Compute the indices of the baseline images and gradient images