Merge pull request InsightSoftwareConsortium#5651 from N-Dekker/FillBuffer-ImageIntensity-tests

hjmjohnson · web-flow · commit 44690acd389c · 2025-11-22T07:30:13.000-06:00
Call FillBuffer on inputImage (A, B, or C) in ImageIntensity tests
diff --git a/Modules/Filtering/ImageIntensity/test/itkAcosImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkAcosImageFilterAndAdaptorTest.cxx
@@ -66,12 +66,7 @@ itkAcosImageFilterAndAdaptorTest(int, char *[])
   // Initialize the content of Image A
   const double pi = std::atan(1.0) * 4.0;
   const double value = pi / 6.0;
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the Acos filter
   using FilterType = itk::AcosImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkAndImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkAndImageFilterTest.cxx
@@ -63,33 +63,13 @@ itkAndImageFilterTest(int argc, char * argv[])
   inputImageB->SetRegions(region);
   inputImageB->Allocate();
 
-  // Declare Iterator types appropriate for each image
-  using InputImage1IteratorType = itk::ImageRegionIteratorWithIndex<InputImage1Type>;
-  using InputImage2IteratorType = itk::ImageRegionIteratorWithIndex<InputImage2Type>;
-
-  // Create one iterator for Image A (this is a light object)
-  InputImage1IteratorType it1(inputImageA, inputImageA->GetBufferedRegion());
-  it1.GoToBegin();
-
   // Initialize the content of Image A
   constexpr InputImage1Type::PixelType valueA{ 2 };
-  while (!it1.IsAtEnd())
-  {
-    it1.Set(valueA);
-    ++it1;
-  }
-
-  // Create one iterator for Image B (this is a light object)
-  InputImage2IteratorType it2(inputImageB, inputImageB->GetBufferedRegion());
-  it2.GoToBegin();
+  inputImageA->FillBuffer(valueA);
 
   // Initialize the content of Image B
   constexpr InputImage2Type::PixelType valueB{ 3 };
-  while (!it2.IsAtEnd())
-  {
-    it2.Set(valueB);
-    ++it2;
-  }
+  inputImageB->FillBuffer(valueB);
 
   using AndImageFilterType = itk::AndImageFilter<InputImage1Type, InputImage2Type, OutputImageType>;
 
diff --git a/Modules/Filtering/ImageIntensity/test/itkAsinImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkAsinImageFilterAndAdaptorTest.cxx
@@ -64,12 +64,7 @@ itkAsinImageFilterAndAdaptorTest(int, char *[])
   // Initialize the content of Image A
   const double pi = std::atan(1.0) * 4.0;
   const double value = pi / 6.0;
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the Asin filter
   using FilterType = itk::AsinImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkAtanImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkAtanImageFilterAndAdaptorTest.cxx
@@ -63,12 +63,7 @@ itkAtanImageFilterAndAdaptorTest(int, char *[])
 
   // Initialize the content of Image A
   constexpr double value{ itk::Math::pi / 6.0 };
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the Atan filter
   using FilterType = itk::AtanImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkBinaryMagnitudeImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkBinaryMagnitudeImageFilterTest.cxx
@@ -59,32 +59,16 @@ itkBinaryMagnitudeImageFilterTest(int, char *[])
   inputImageB->SetRegions(region);
   inputImageB->Allocate();
 
-  // Declare appropriate Iterator types for each image
-  using InputImage1IteratorType = itk::ImageRegionIteratorWithIndex<InputImageType1>;
-  using InputImage2IteratorType = itk::ImageRegionIteratorWithIndex<InputImageType2>;
+  // Declare appropriate Iterator type
   using OutputImageIteratorType = itk::ImageRegionIteratorWithIndex<OutputImageType>;
 
-  // Create one iterator for Image A (this is a light object)
-  InputImage1IteratorType it1(inputImageA, inputImageA->GetBufferedRegion());
-
   // Initialize the content of Image A
   constexpr InputImageType1::PixelType input1Value{ 3.0 };
-  while (!it1.IsAtEnd())
-  {
-    it1.Set(input1Value);
-    ++it1;
-  }
-
-  // Create one iterator for Image B (this is a light object)
-  InputImage2IteratorType it2(inputImageB, inputImageB->GetBufferedRegion());
+  inputImageA->FillBuffer(input1Value);
 
   // Initialize the content of Image B
   constexpr InputImageType2::PixelType input2Value{ 4.0 };
-  while (!it2.IsAtEnd())
-  {
-    it2.Set(input2Value);
-    ++it2;
-  }
+  inputImageB->FillBuffer(input2Value);
 
   // Define the values of the output image
   constexpr OutputImageType::PixelType outputValue{ 5.0 };
diff --git a/Modules/Filtering/ImageIntensity/test/itkComplexToImaginaryFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkComplexToImaginaryFilterAndAdaptorTest.cxx
@@ -61,12 +61,7 @@ itkComplexToImaginaryFilterAndAdaptorTest(int, char *[])
 
   // Initialize the content of Image A
   constexpr InputPixelType value(13, 25);
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the ComplexToImaginary filter
   using FilterType = itk::ComplexToImaginaryImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkComplexToModulusFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkComplexToModulusFilterAndAdaptorTest.cxx
@@ -65,12 +65,7 @@ itkComplexToModulusFilterAndAdaptorTest(int, char *[])
   const double modulus = std::sqrt(value.real() * value.real() + value.imag() * value.imag());
 
   std::cout << "Modulus of input pixel = " << modulus << std::endl;
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the ComplexToModulus filter
   using FilterType = itk::ComplexToModulusImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkComplexToPhaseFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkComplexToPhaseFilterAndAdaptorTest.cxx
@@ -61,12 +61,7 @@ itkComplexToPhaseFilterAndAdaptorTest(int, char *[])
 
   // Initialize the content of Image A
   constexpr InputPixelType value(13, 25);
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the ComplexToPhase filter
   using FilterType = itk::ComplexToPhaseImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkComplexToRealFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkComplexToRealFilterAndAdaptorTest.cxx
@@ -61,12 +61,7 @@ itkComplexToRealFilterAndAdaptorTest(int, char *[])
 
   // Initialize the content of Image A
   constexpr InputPixelType value(13, 25);
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the ComplexToReal filter
   using FilterType = itk::ComplexToRealImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkCosImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkCosImageFilterAndAdaptorTest.cxx
@@ -63,12 +63,7 @@ itkCosImageFilterAndAdaptorTest(int, char *[])
 
   // Initialize the content of Image A
   constexpr double value{ itk::Math::pi / 6.0 };
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the Cos filter
   using FilterType = itk::CosImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkLog10ImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkLog10ImageFilterAndAdaptorTest.cxx
@@ -61,12 +61,7 @@ itkLog10ImageFilterAndAdaptorTest(int, char *[])
 
   // Initialize the content of Image A
   constexpr double value{ itk::Math::pi / 6.0 };
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the Log10 filter
   using FilterType = itk::Log10ImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkLogImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkLogImageFilterAndAdaptorTest.cxx
@@ -62,12 +62,7 @@ itkLogImageFilterAndAdaptorTest(int, char *[])
 
   // Initialize the content of Image A
   constexpr double value{ itk::Math::pi / 6.0 };
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the Log filter
   using FilterType = itk::LogImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkMaximumImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkMaximumImageFilterTest.cxx
@@ -62,28 +62,11 @@ itkMaximumImageFilterTest(int, char *[])
   constexpr PixelType largePixelValue{ 3 };
   constexpr PixelType smallPixelValue{ 2 };
 
-  // Declare Iterator types appropriate for each image
-  using IteratorType = itk::ImageRegionIteratorWithIndex<ImageType>;
-
-  // Create one iterator for Image A (this is a light object)
-  IteratorType it1(inputImageA, inputImageA->GetBufferedRegion());
-
   // Initialize the content of Image A
-  while (!it1.IsAtEnd())
-  {
-    it1.Set(smallPixelValue);
-    ++it1;
-  }
-
-  // Create one iterator for Image B (this is a light object)
-  IteratorType it2(inputImageB, inputImageB->GetBufferedRegion());
+  inputImageA->FillBuffer(smallPixelValue);
 
   // Initialize the content of Image B
-  while (!it2.IsAtEnd())
-  {
-    it2.Set(largePixelValue);
-    ++it2;
-  }
+  inputImageB->FillBuffer(largePixelValue);
 
   // Create the filter
   auto maximumImageFilter = MaximumImageFilterType::New();
diff --git a/Modules/Filtering/ImageIntensity/test/itkMinimumImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkMinimumImageFilterTest.cxx
@@ -62,28 +62,11 @@ itkMinimumImageFilterTest(int, char *[])
   constexpr PixelType largePixelValue{ 3 };
   constexpr PixelType smallPixelValue{ 2 };
 
-  // Declare Iterator types appropriate for each image
-  using IteratorType = itk::ImageRegionIteratorWithIndex<ImageType>;
-
-  // Create one iterator for Image A (this is a light object)
-  IteratorType it1(inputImageA, inputImageA->GetBufferedRegion());
-
   // Initialize the content of Image A
-  while (!it1.IsAtEnd())
-  {
-    it1.Set(smallPixelValue);
-    ++it1;
-  }
-
-  // Create one iterator for Image B (this is a light object)
-  IteratorType it2(inputImageB, inputImageB->GetBufferedRegion());
+  inputImageA->FillBuffer(smallPixelValue);
 
   // Initialize the content of Image B
-  while (!it2.IsAtEnd())
-  {
-    it2.Set(largePixelValue);
-    ++it2;
-  }
+  inputImageB->FillBuffer(largePixelValue);
 
   // Create the filter
   auto minimumImageFilter = MinimumFilterType::New();
diff --git a/Modules/Filtering/ImageIntensity/test/itkNaryMaximumImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkNaryMaximumImageFilterTest.cxx
@@ -64,12 +64,7 @@ InitializeImage(InputImageType * image, double value)
 
   InImageIteratorType it(inputImage, inputImage->GetRequestedRegion());
 
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 }
 
 // Function for image printing
diff --git a/Modules/Filtering/ImageIntensity/test/itkNotImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkNotImageFilterTest.cxx
@@ -60,14 +60,9 @@ itkNotImageFilterTest(int, char *[])
 
   // Create one iterator for Image A (this is a light object)
   InputIteratorType it(inputImage, inputImage->GetBufferedRegion());
-  it.GoToBegin();
 
   // Initialize the content of Image A
-  while (!it.IsAtEnd())
-  {
-    it.Set(true);
-    ++it;
-  }
+  inputImage->FillBuffer(true);
 
   // Create the filter
   auto filter = NotImageFilterType::New();
diff --git a/Modules/Filtering/ImageIntensity/test/itkOrImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkOrImageFilterTest.cxx
@@ -67,33 +67,13 @@ itkOrImageFilterTest(int argc, char * argv[])
   inputImageB->SetRegions(region);
   inputImageB->Allocate();
 
-  // Declare appropriate Iterator types for each image
-  using InputImage1IteratorType = itk::ImageRegionIteratorWithIndex<InputImage1Type>;
-  using InputImage2IteratorType = itk::ImageRegionIteratorWithIndex<InputImage2Type>;
-
-  // Create one iterator for Image A (this is a light object)
-  InputImage1IteratorType it1(inputImageA, inputImageA->GetBufferedRegion());
-  it1.GoToBegin();
-
   // Initialize the content of Image A
   constexpr InputImage1Type::PixelType valueA{ 2 };
-  while (!it1.IsAtEnd())
-  {
-    it1.Set(valueA);
-    ++it1;
-  }
-
-  // Create one iterator for Image B (this is a light object)
-  InputImage2IteratorType it2(inputImageB, inputImageB->GetBufferedRegion());
-  it2.GoToBegin();
+  inputImageA->FillBuffer(valueA);
 
   // Initialize the content of Image B
   constexpr InputImage2Type::PixelType valueB{ 3 };
-  while (!it2.IsAtEnd())
-  {
-    it2.Set(valueB);
-    ++it2;
-  }
+  inputImageB->FillBuffer(valueB);
 
   // Create the filter
   auto filter = OrImageFilterType::New();
diff --git a/Modules/Filtering/ImageIntensity/test/itkRGBToLuminanceImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkRGBToLuminanceImageFilterAndAdaptorTest.cxx
@@ -70,12 +70,7 @@ itkRGBToLuminanceImageFilterAndAdaptorTest(int, char *[])
   pixel.SetGreen(1.0);
   pixel.SetBlue(1.0);
 
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(pixel);
-    ++it;
-  }
+  inputImage->FillBuffer(pixel);
 
   // Declare the type for the RGBToLuminance filter
   using FilterType = itk::RGBToLuminanceImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkSigmoidImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkSigmoidImageFilterTest.cxx
@@ -61,12 +61,7 @@ itkSigmoidImageFilterTest(int, char *[])
 
   // Initialize the content of the input image
   constexpr double value{ 30 };
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the Sigmoid filter
   using FilterType = itk::SigmoidImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkSinImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkSinImageFilterAndAdaptorTest.cxx
@@ -63,12 +63,7 @@ itkSinImageFilterAndAdaptorTest(int, char *[])
 
   // Initialize the content of Image A
   constexpr double value{ itk::Math::pi / 6.0 };
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the Sin filter
   using FilterType = itk::SinImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkSqrtImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkSqrtImageFilterAndAdaptorTest.cxx
@@ -63,12 +63,7 @@ itkSqrtImageFilterAndAdaptorTest(int, char *[])
 
   // Initialize the content of the input image
   constexpr double value{ itk::Math::pi / 6.0 };
-  it.GoToBegin();
-  while (!it.IsAtEnd())
-  {
-    it.Set(value);
-    ++it;
-  }
+  inputImage->FillBuffer(value);
 
   // Declare the type for the Sqrt filter
   using FilterType = itk::SqrtImageFilter<InputImageType, OutputImageType>;
diff --git a/Modules/Filtering/ImageIntensity/test/itkSymmetricEigenAnalysisImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkSymmetricEigenAnalysisImageFilterTest.cxx
diff --git a/Modules/Filtering/ImageIntensity/test/itkTanImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkTanImageFilterAndAdaptorTest.cxx
diff --git a/Modules/Filtering/ImageIntensity/test/itkTernaryMagnitudeImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkTernaryMagnitudeImageFilterTest.cxx
diff --git a/Modules/Filtering/ImageIntensity/test/itkTernaryMagnitudeSquaredImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkTernaryMagnitudeSquaredImageFilterTest.cxx
diff --git a/Modules/Filtering/ImageIntensity/test/itkXorImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkXorImageFilterTest.cxx
