Merge pull request InsightSoftwareConsortium#6019 from N-Dekker/Simplify-local-region-iterator-initializations-hxx

Simplify initialization of local region iterators in hxx files

Author: hjmjohnson

Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryMorphologyImageFilter.hxx

@@ -114,8 +114,7 @@ BinaryMorphologyImageFilter<TInputImage, TOutputImage, TKernel>::AnalyzeKernel()
   tmpSEImage->Allocate();
 
   // copy
-  ImageRegionIterator<BoolImageType> kernelImageIt; // iterator on image
-  kernelImageIt = ImageRegionIterator(tmpSEImage, tmpSEImage->GetRequestedRegion());
+  ImageRegionIterator kernelImageIt(tmpSEImage, tmpSEImage->GetRequestedRegion());
 
   kernel_it = KernelBegin;
 

Modules/Filtering/BinaryMathematicalMorphology/include/itkObjectMorphologyImageFilter.hxx

@@ -98,8 +98,8 @@ ObjectMorphologyImageFilter<TInputImage, TOutputImage, TKernel>::BeforeThreadedG
 
   const RegionType requestedRegion = this->GetOutput()->GetRequestedRegion();
 
-  auto iRegIter = ImageRegionConstIterator(this->GetInput(), requestedRegion);
-  auto oRegIter = ImageRegionIterator(this->GetOutput(), requestedRegion);
+  ImageRegionConstIterator iRegIter(this->GetInput(), requestedRegion);
+  ImageRegionIterator      oRegIter(this->GetOutput(), requestedRegion);
   /* Copy the input image to the output image - then only boundary pixels
    * need to be changed in the output image */
   while (!oRegIter.IsAtEnd())

Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.hxx

@@ -51,11 +51,10 @@ Hessian3DToVesselnessMeasureImageFilter<TPixel>::GenerateData()
   const typename EigenValueOutputImageType::ConstPointer eigenImage = m_SymmetricEigenValueFilter->GetOutput();
 
   // walk the region of eigen values and get the vesselness measure
-  EigenValueArrayType                  eigenValue;
-  ImageRegionConstIterator             it(eigenImage, eigenImage->GetRequestedRegion());
-  ImageRegionIterator<OutputImageType> oit;
+  EigenValueArrayType      eigenValue;
+  ImageRegionConstIterator it(eigenImage, eigenImage->GetRequestedRegion());
   this->AllocateOutputs();
-  oit = ImageRegionIterator(output, output->GetRequestedRegion());
+  ImageRegionIterator oit(output, output->GetRequestedRegion());
   while (!it.IsAtEnd())
   {
     // Get the eigen value

Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.hxx

@@ -123,9 +123,9 @@ ZeroCrossingImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(
     bit.OverrideBoundaryCondition(&nbc);
     bit.GoToBegin();
 
-    static constexpr SizeValueType    neighborhoodSize = Math::UnsignedPower(3, ImageDimension);
-    static constexpr SizeValueType    center = neighborhoodSize / 2;
-    ImageRegionIterator<TOutputImage> it = ImageRegionIterator(output, face);
+    static constexpr SizeValueType neighborhoodSize = Math::UnsignedPower(3, ImageDimension);
+    static constexpr SizeValueType center = neighborhoodSize / 2;
+    ImageRegionIterator            it(output, face);
     while (!bit.IsAtEnd())
     {
       const InputImagePixelType this_one = bit.GetPixel(center);

Modules/Registration/PDEDeformable/include/itkCurvatureRegistrationFilter.hxx

@@ -204,18 +204,13 @@ CurvatureRegistrationFilter<TFixedImage, TMovingImage, TDisplacementField, TImag
   (void)dt;
   const DisplacementFieldPointer update = this->GetUpdateBuffer();
 
-  ImageRegionConstIterator<DisplacementFieldType>   itInDeformation;
-  ImageRegionIterator<DisplacementFieldType>        itOutDeformation;
-  ImageRegionConstIterator<DisplacementFieldType>   itInUpdate;
-  ImageRegionConstIteratorWithIndex<FixedImageType> fixedImageIteratorWithIndex;
-
-  itInDeformation =
-    ImageRegionConstIterator(this->GetDisplacementField(), this->GetDisplacementField()->GetLargestPossibleRegion());
-  itOutDeformation =
-    ImageRegionIterator(this->GetDisplacementField(), this->GetDisplacementField()->GetLargestPossibleRegion());
-  itInUpdate = ImageRegionConstIterator(update, update->GetLargestPossibleRegion());
-  fixedImageIteratorWithIndex = ImageRegionConstIteratorWithIndex<FixedImageType>(
-    this->GetFixedImage(), this->GetFixedImage()->GetLargestPossibleRegion());
+  ImageRegionConstIterator          itInDeformation(this->GetDisplacementField(),
+                                           this->GetDisplacementField()->GetLargestPossibleRegion());
+  ImageRegionIterator               itOutDeformation(this->GetDisplacementField(),
+                                       this->GetDisplacementField()->GetLargestPossibleRegion());
+  ImageRegionConstIterator          itInUpdate(update, update->GetLargestPossibleRegion());
+  ImageRegionConstIteratorWithIndex fixedImageIteratorWithIndex(this->GetFixedImage(),
+                                                                this->GetFixedImage()->GetLargestPossibleRegion());
 
   const SizeValueType numberOfPixels = this->GetFixedImage()->GetLargestPossibleRegion().GetNumberOfPixels();
 

Modules/Segmentation/LevelSets/include/itkExtensionVelocitiesImageFilter.hxx

@@ -143,14 +143,9 @@ ExtensionVelocitiesImageFilter<TLevelSet, TAuxValue, VAuxDimension>::GenerateDat
   const double levelSetValue = this->GetLevelSetValue();
 
   // define iterators
-  using LocalLevelSetImageType = typename LevelSetType::LevelSetImageType;
-
   ImageRegionConstIterator inputIt(inputPtr, inputPtr->GetBufferedRegion());
   ImageRegionIterator      outputIt(outputPtr, outputPtr->GetBufferedRegion());
 
-  ImageRegionIterator<LocalLevelSetImageType> tempIt;
-
-
   ImageRegionIterator<AuxImageType> auxTempIt[VAuxDimension];
   ImageRegionIterator<AuxImageType> auxOutputIt[VAuxDimension];
 
@@ -178,7 +173,7 @@ ExtensionVelocitiesImageFilter<TLevelSet, TAuxValue, VAuxDimension>::GenerateDat
   m_Marcher->SetAuxiliaryTrialValues(m_Locator->GetModifiableAuxOutsideValues());
   m_Marcher->Update();
 
-  tempIt = ImageRegionIterator(tempLevelSet, tempLevelSet->GetBufferedRegion());
+  ImageRegionIterator tempIt(tempLevelSet, tempLevelSet->GetBufferedRegion());
 
   for (unsigned int k = 0; k < VAuxDimension; ++k)
   {

Modules/Segmentation/Watersheds/include/itkWatershedSegmenter.hxx

@@ -336,8 +336,7 @@ Segmenter<TInputImage>::CollectBoundaryInformation(flat_region_table_t & flatReg
       const ImageRegionType                        region = face->GetRequestedRegion();
 
       // Grab all the labels of the boundary pixels.
-      ImageRegionIterator<typename BoundaryType::face_t> faceIt =
-        ImageRegionIterator<typename BoundaryType::face_t>(face, region);
+      ImageRegionIterator faceIt(face, region);
       ImageRegionIterator labelIt(output, region);
       faceIt.GoToBegin();
       labelIt.GoToBegin();
@@ -443,10 +442,9 @@ Segmenter<TInputImage>::AnalyzeBoundaryFlow(InputImageTypePointer thresholdImage
       const typename BoundaryType::face_t::Pointer face = boundary->GetFace(idx);
       const ImageRegionType                        region = face->GetRequestedRegion();
 
-      ConstNeighborhoodIterator<InputImageType>          searchIt(rad, thresholdImage, region);
-      NeighborhoodIterator<OutputImageType>              labelIt(rad, output, region);
-      ImageRegionIterator<typename BoundaryType::face_t> faceIt =
-        ImageRegionIterator<typename BoundaryType::face_t>(face, region);
+      ConstNeighborhoodIterator<InputImageType> searchIt(rad, thresholdImage, region);
+      NeighborhoodIterator<OutputImageType>     labelIt(rad, output, region);
+      ImageRegionIterator                       faceIt(face, region);
 
       const unsigned int nCenter = searchIt.Size() / 2;
       searchIt.GoToBegin();