Merge pull request #5650 from N-Dekker/ImageBufferRange-ImageAlgorithmCopyTest2

Use ImageBufferRange in ImagePCADecompositionCalculatorTest, ImageAlgorithmCopyTest2 and BSplineTransformGTest

Author: hjmjohnson

Modules/Core/Common/test/itkImageAlgorithmCopyTest2.cxx

@@ -24,29 +24,25 @@
 #include "itkTestingComparisonImageFilter.h"
 
 #include "itkImageAdaptor.h"
+#include "itkImageBufferRange.h"
 #include "itkAbsImageAdaptor.h"
 #include "itkMath.h"
 
+#include <algorithm> // For all_of.
+
 namespace
 {
 
 template <typename TImageType>
 bool
 CheckBuffer(const TImageType * image, typename TImageType::PixelType p)
 {
-  using ImageIterator = itk::ImageRegionConstIterator<TImageType>;
-
-  ImageIterator iter(image, image->GetBufferedRegion());
-
-  while (!iter.IsAtEnd())
-  {
-    if (itk::Math::NotExactlyEquals(iter.Get(), p))
-    {
-      return false;
-    }
-    ++iter;
-  }
-  return true;
+  const itk::ImageBufferRange<const TImageType> imageBufferRange(*image);
+
+  return std::all_of(
+    imageBufferRange.cbegin(), imageBufferRange.cend(), [p](const typename TImageType::PixelType pixelValue) {
+      return itk::Math::ExactlyEquals(pixelValue, p);
+    });
 }
 
 } // namespace

Modules/Core/Transform/test/itkBSplineTransformGTest.cxx

@@ -21,8 +21,11 @@
 #include "itkGTest.h"
 #include "itkBSplineTransform.h"
 
+#include "itkImageBufferRange.h"
 #include "itkImageRegionConstIterator.h"
 
+#include <algorithm> // For generate.
+
 namespace
 {
 
@@ -107,7 +110,6 @@ TEST(ITKBSplineTransform, CopyingClone)
 
   using BSplineType = itk::BSplineTransform<double, 2, 3>;
   using ImageType = typename BSplineType::ImageType;
-  using ImageIterator = typename itk::ImageRegionIterator<ImageType>;
 
   typename BSplineType::CoefficientImageArray coeffImageArray;
 
@@ -139,14 +141,8 @@ TEST(ITKBSplineTransform, CopyingClone)
 
     coeffImage->Allocate();
 
-    ImageIterator iter(coeffImage, coeffImage->GetBufferedRegion());
-
-
-    while (!iter.IsAtEnd())
-    {
-      iter.Set(px_value++);
-      ++iter;
-    }
+    const itk::ImageBufferRange<ImageType> imageBufferRange(*coeffImage);
+    std::generate(imageBufferRange.begin(), imageBufferRange.end(), [&px_value] { return px_value++; });
   }
 
   auto bspline1 = BSplineType::New();

Modules/Filtering/ImageStatistics/test/itkImagePCADecompositionCalculatorTest.cxx

@@ -21,8 +21,12 @@
 #include "itkTextOutput.h"
 
 #include "itkImagePCADecompositionCalculator.h"
+#include "itkImageBufferRange.h"
 #include "itkTestingMacros.h"
 
+#include <algorithm> // For copy.
+#include <iterator>
+
 // class to support progress feedback
 
 
@@ -337,11 +341,10 @@ itkImagePCADecompositionCalculatorTest(int, char *[])
   for (const auto & basis_it : basis_check)
   {
     std::cout << '[';
-    InputImageIterator basisImage_it(basis_it, basis_it->GetBufferedRegion());
-    for (basisImage_it.GoToBegin(); !basisImage_it.IsAtEnd(); ++basisImage_it)
-    {
-      std::cout << basisImage_it.Get() << ' ';
-    }
+    const itk::ImageBufferRange<const InputImageType> imageBufferRange(*basis_it);
+    std::copy(imageBufferRange.cbegin(),
+              imageBufferRange.cend(),
+              std::ostream_iterator<InputImageType::PixelType>(std::cout, " "));
     std::cout << ']' << std::endl;
   }
 
@@ -358,11 +361,10 @@ itkImagePCADecompositionCalculatorTest(int, char *[])
   for (const auto & basis_it : basis_check_2)
   {
     std::cout << '[';
-    InputImageIterator basisImage_it(basis_it, basis_it->GetBufferedRegion());
-    for (basisImage_it.GoToBegin(); !basisImage_it.IsAtEnd(); ++basisImage_it)
-    {
-      std::cout << basisImage_it.Get() << ' ';
-    }
+    const itk::ImageBufferRange<const InputImageType> imageBufferRange(*basis_it);
+    std::copy(imageBufferRange.cbegin(),
+              imageBufferRange.cend(),
+              std::ostream_iterator<InputImageType::PixelType>(std::cout, " "));
     std::cout << ']' << std::endl;
   }