Merge pull request #5656 from N-Dekker/fill-ImageRegionRange-in-tests

Use `ImageRegionRange` with `std::fill` in Filtering and Registration tests

Author: hjmjohnson

Modules/Filtering/ImageFilterBase/test/itkMaskNeighborhoodOperatorImageFilterTest.cxx

@@ -21,9 +21,12 @@
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkImageFileReader.h"
 #include "itkImageFileWriter.h"
+#include "itkImageRegionRange.h"
 #include "itkSobelOperator.h"
 #include "itkTestingMacros.h"
 
+#include <algorithm> // For fill.
+
 int
 itkMaskNeighborhoodOperatorImageFilterTest(int argc, char * argv[])
 {
@@ -63,24 +66,14 @@ itkMaskNeighborhoodOperatorImageFilterTest(int argc, char * argv[])
   index[0] = size[0] + static_cast<unsigned int>(.25 * static_cast<float>(width));
   region = { index, size };
   {
-    itk::ImageRegionIterator<MaskImageType> it(mask1, region);
-    it.GoToBegin();
-    while (!it.IsAtEnd())
-    {
-      it.Set(1);
-      ++it;
-    }
+    const itk::ImageRegionRange<MaskImageType> imageRegionRange(*mask1, region);
+    std::fill(imageRegionRange.begin(), imageRegionRange.end(), 1);
   }
   index[0] = 0;
   region.SetIndex(index);
   {
-    itk::ImageRegionIterator<MaskImageType> it(mask2, region);
-    it.GoToBegin();
-    while (!it.IsAtEnd())
-    {
-      it.Set(1);
-      ++it;
-    }
+    const itk::ImageRegionRange<MaskImageType> imageRegionRange(*mask2, region);
+    std::fill(imageRegionRange.begin(), imageRegionRange.end(), 1);
   }
 
   // Create a filter

Modules/Filtering/ImageIntensity/test/itkMatrixIndexSelectionImageFilterTest.cxx

@@ -16,11 +16,14 @@
  *
  *=========================================================================*/
 
-#include <fstream>
 #include "itkMatrixIndexSelectionImageFilter.h"
 #include "itkImageFileWriter.h"
+#include "itkImageRegionRange.h"
 #include "itkTestingMacros.h"
 
+#include <algorithm> // For fill.
+#include <fstream>
+
 int
 itkMatrixIndexSelectionImageFilterTest(int argc, char * argv[])
 {
@@ -72,13 +75,8 @@ itkMatrixIndexSelectionImageFilterTest(int argc, char * argv[])
     pixel[1][0] = 0;
     pixel[1][1] = 64;
 
-    itk::ImageRegionIterator<InputImageType> it(image, region);
-    it.GoToBegin();
-    while (!it.IsAtEnd())
-    {
-      it.Set(pixel);
-      ++it;
-    }
+    const itk::ImageRegionRange<InputImageType> imageRegionRange(*image, region);
+    std::fill(imageRegionRange.begin(), imageRegionRange.end(), pixel);
   }
 
   // Populate lower half of image
@@ -92,13 +90,8 @@ itkMatrixIndexSelectionImageFilterTest(int argc, char * argv[])
     pixel[1][0] = 255;
     pixel[1][1] = 192;
 
-    itk::ImageRegionIterator<InputImageType> it(image, region);
-    it.GoToBegin();
-    while (!it.IsAtEnd())
-    {
-      it.Set(pixel);
-      ++it;
-    }
+    const itk::ImageRegionRange<InputImageType> imageRegionRange(*image, region);
+    std::fill(imageRegionRange.begin(), imageRegionRange.end(), pixel);
   }
 
   using SelectionFilterType = itk::MatrixIndexSelectionImageFilter<InputImageType, OutputImageType>;

Modules/Registration/Common/test/itkCenteredTransformInitializerTest.cxx

@@ -18,7 +18,9 @@
 
 #include "itkVersorRigid3DTransform.h"
 #include "itkCenteredTransformInitializer.h"
-#include "itkImageRegionIterator.h"
+#include "itkImageRegionRange.h"
+
+#include <algorithm> // For fill.
 
 
 namespace
@@ -192,15 +194,8 @@ PopulateImage(itk::SmartPointer<TImage> image)
   SizeType   internalSize{ size[0] - 2 * border, size[1] - 2 * border, size[2] - 2 * border };
   RegionType internalRegion = { internalIndex, internalSize };
 
-  using Iterator = itk::ImageRegionIterator<ImageType>;
-  Iterator it(image, internalRegion);
-
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(200);
-    ++it;
-  }
+  const itk::ImageRegionRange<TImage> imageRegionRange(*image, internalRegion);
+  std::fill(imageRegionRange.begin(), imageRegionRange.end(), 200);
 }
 
 } // namespace

Modules/Registration/Common/test/itkCenteredVersorTransformInitializerTest.cxx

@@ -18,9 +18,10 @@
 
 #include "itkCenteredVersorTransformInitializer.h"
 
-#include "itkImageRegionIterator.h"
+#include "itkImageRegionRange.h"
 #include "itkTestingMacros.h"
 
+#include <algorithm> // For fill.
 
 /**
  *  This program tests the use of the CenteredVersorTransformInitializer class
@@ -88,16 +89,8 @@ itkCenteredVersorTransformInitializerTest(int, char *[])
 
   internalRegion = { internalIndex, internalSize };
 
-  using FixedIterator = itk::ImageRegionIterator<FixedImageType>;
-  FixedIterator fi(fixedImage, internalRegion);
-
-  fi.GoToBegin();
-  while (!fi.IsAtEnd())
-  {
-    fi.Set(200);
-    ++fi;
-  }
-
+  const itk::ImageRegionRange<FixedImageType> fixedImageRegionRange(*fixedImage, internalRegion);
+  std::fill(fixedImageRegionRange.begin(), fixedImageRegionRange.end(), 200);
 
   internalIndex[0] = 10;
   internalIndex[1] = 20;
@@ -110,16 +103,8 @@ itkCenteredVersorTransformInitializerTest(int, char *[])
 
   internalRegion = { internalIndex, internalSize };
 
-
-  using MovingIterator = itk::ImageRegionIterator<MovingImageType>;
-  MovingIterator mi(movingImage, internalRegion);
-
-  mi.GoToBegin();
-  while (!mi.IsAtEnd())
-  {
-    mi.Set(200);
-    ++mi;
-  }
+  const itk::ImageRegionRange<MovingImageType> movingImageRegionRange(*movingImage, internalRegion);
+  std::fill(movingImageRegionRange.begin(), movingImageRegionRange.end(), 200);
 
   auto transform = TransformType::New();
   transform->SetIdentity();