Skip to content

Commit d067ca8

Browse files
hjmjohnsonhjmjohnson
authored
Merge pull request InsightSoftwareConsortium#5982 from N-Dekker/CTAD-ImageRegionIterator
STYLE: Use CTAD for `ImageRegionIterator` variables in hxx files
2 parents 1f2f970 + b6a38b1 commit d067ca8

File tree

103 files changed

+223
-241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+223
-241
lines changed

‎Modules/Core/Common/include/itkImageAlgorithm.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ImageAlgorithm::ReferenceCopy(const InputImageType * inIma
5454
}
5555

5656
ImageRegionConstIterator<InputImageType> it(inImage, inRegion);
57-
ImageRegionIterator<OutputImageType> ot(outImage, outRegion);
57+
ImageRegionIterator ot(outImage, outRegion);
5858

5959
while (!it.IsAtEnd())
6060
{

‎Modules/Core/Common/include/itkNeighborhoodIteratorTestCommon.hxx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,10 @@ void
6565
FillImage(itk::Image<itk::Index<VDimension>, VDimension> * img)
6666
{
6767
using IndexType = itk::Index<VDimension>;
68-
using ImageType = itk::Image<IndexType, VDimension>;
6968
const itk::Size<VDimension> size = img->GetRequestedRegion().GetSize();
7069

71-
IndexType loop{};
72-
itk::ImageRegionIterator<ImageType> it(img, img->GetRequestedRegion());
70+
IndexType loop{};
71+
itk::ImageRegionIterator it(img, img->GetRequestedRegion());
7372

7473
while (!it.IsAtEnd())
7574
{

‎Modules/Core/FiniteDifference/include/itkDenseFiniteDifferenceImageFilter.hxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ DenseFiniteDifferenceImageFilter<TInputImage, TOutputImage>::CopyInputToOutput()
4848
}
4949

5050
ImageRegionConstIterator<TInputImage> in(input, output->GetRequestedRegion());
51-
ImageRegionIterator<TOutputImage> out(output, output->GetRequestedRegion());
51+
ImageRegionIterator out(output, output->GetRequestedRegion());
5252

5353
while (!out.IsAtEnd())
5454
{
@@ -188,8 +188,8 @@ DenseFiniteDifferenceImageFilter<TInputImage, TOutputImage>::ThreadedApplyUpdate
188188
const ThreadRegionType & regionToProcess,
189189
ThreadIdType)
190190
{
191-
ImageRegionIterator<UpdateBufferType> u(m_UpdateBuffer, regionToProcess);
192-
ImageRegionIterator<OutputImageType> o(this->GetOutput(), regionToProcess);
191+
ImageRegionIterator u(m_UpdateBuffer, regionToProcess);
192+
ImageRegionIterator o(this->GetOutput(), regionToProcess);
193193

194194
while (!u.IsAtEnd())
195195
{
@@ -238,8 +238,8 @@ DenseFiniteDifferenceImageFilter<TInputImage, TOutputImage>::ThreadedCalculateCh
238238
auto fEnd = faceList.end();
239239

240240
// Process the non-boundary region.
241-
NeighborhoodIteratorType nD(radius, output, *fIt);
242-
ImageRegionIterator<UpdateBufferType> nU(m_UpdateBuffer, *fIt);
241+
NeighborhoodIteratorType nD(radius, output, *fIt);
242+
ImageRegionIterator nU(m_UpdateBuffer, *fIt);
243243
nD.GoToBegin();
244244
while (!nD.IsAtEnd())
245245
{
@@ -251,8 +251,8 @@ DenseFiniteDifferenceImageFilter<TInputImage, TOutputImage>::ThreadedCalculateCh
251251
// Process each of the boundary faces.
252252
for (++fIt; fIt != fEnd; ++fIt)
253253
{
254-
NeighborhoodIteratorType bD(radius, output, *fIt);
255-
ImageRegionIterator<UpdateBufferType> bU(m_UpdateBuffer, *fIt);
254+
NeighborhoodIteratorType bD(radius, output, *fIt);
255+
ImageRegionIterator bU(m_UpdateBuffer, *fIt);
256256

257257
bD.GoToBegin();
258258
while (!bD.IsAtEnd())

‎Modules/Core/SpatialObjects/include/itkMetaImageConverter.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ MetaImageConverter<VDimension, PixelType, TSpatialObjectType>::MetaObjectToSpati
104104

105105
this->MetaObjectToSpatialObjectBase(imageMO, imageSO);
106106

107-
ImageRegionIterator<ImageType> it(myImage, myImage->GetLargestPossibleRegion());
107+
ImageRegionIterator it(myImage, myImage->GetLargestPossibleRegion());
108108
for (unsigned int i = 0; !it.IsAtEnd(); i++, ++it)
109109
{
110110
it.Set(static_cast<typename ImageType::PixelType>(imageMO->ElementData(i)));

‎Modules/Core/TestKernel/include/itkRandomImageSource.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ RandomImageSource<TOutputImage>::DynamicThreadedGenerateData(const OutputImageRe
190190
const auto dMin = static_cast<double>(m_Min);
191191
const auto dMax = static_cast<double>(m_Max);
192192

193-
for (ImageRegionIterator<TOutputImage> it(image, outputRegionForThread); !it.IsAtEnd(); ++it)
193+
for (ImageRegionIterator it(image, outputRegionForThread); !it.IsAtEnd(); ++it)
194194
{
195195
sample_seed = (sample_seed * 16807) % 2147483647L;
196196
const double u = static_cast<double>(sample_seed) / 2147483711UL;

‎Modules/Core/TestKernel/include/itkTestingComparisonImageFilter.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ ComparisonImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(
130130
{
131131
SmartIterator test(radius, testImage, *face); // Iterate over test image.
132132
ImageRegionConstIterator<InputImageType> valid(validImage, *face); // Iterate over valid image.
133-
ImageRegionIterator<OutputImageType> out(outputPtr, *face); // Iterate over output image.
133+
ImageRegionIterator out(outputPtr, *face); // Iterate over output image.
134134
if (!test.GetNeedToUseBoundaryCondition() || !m_IgnoreBoundaryPixels)
135135
{
136136
test.OverrideBoundaryCondition(&nbc);

‎Modules/Core/TestKernel/include/itkTestingExtractSliceImageFilter.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ ExtractSliceImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(
251251
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
252252

253253

254-
ImageRegionIterator<TOutputImage> outIt(outputPtr, outputRegionForThread);
254+
ImageRegionIterator outIt(outputPtr, outputRegionForThread);
255255
ImageRegionConstIterator<TInputImage> inIt(inputPtr, inputRegionForThread);
256256

257257
// walk the output region, and sample the input image

‎Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ StretchIntensityImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateD
107107
const InputImageRegionType inputRegionForThread = outputRegionForThread;
108108

109109
ImageRegionConstIterator<TInputImage> inputIt(inputPtr, inputRegionForThread);
110-
ImageRegionIterator<TOutputImage> outputIt(outputPtr, outputRegionForThread);
110+
ImageRegionIterator outputIt(outputPtr, outputRegionForThread);
111111

112112
while (!inputIt.IsAtEnd())
113113
{

‎Modules/Core/Transform/include/itkBSplineBaseTransform.hxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ BSplineBaseTransform<TParametersValueType, VDimension, VSplineOrder>::
252252
unsigned long counter = 0;
253253

254254

255-
ImageRegionIterator<ImageType> coeffIterator(this->m_CoefficientImages[0], supportRegion);
256-
const ParametersValueType * basePointer = this->m_CoefficientImages[0]->GetBufferPointer();
255+
ImageRegionIterator coeffIterator(this->m_CoefficientImages[0], supportRegion);
256+
const ParametersValueType * basePointer = this->m_CoefficientImages[0]->GetBufferPointer();
257257
while (!coeffIterator.IsAtEnd())
258258
{
259259
indexes[counter] = &(coeffIterator.Value()) - basePointer;

‎Modules/Filtering/BiasCorrection/include/itkMRIBiasFieldCorrectionFilter.hxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ MRIBiasEnergyFunction<TImage, TImageMask, TBiasField>::GetValue(const Parameters
8181

8282
if (m_SamplingFactor[0] == 1 && m_SamplingFactor[1] == 1 && m_SamplingFactor[2] == 1)
8383
{
84-
ImageRegionIterator<ImageType> iIter(m_Image, m_Region);
84+
ImageRegionIterator iIter(m_Image, m_Region);
8585
typename TBiasField::SimpleForwardIterator bIter(m_BiasField);
8686

8787
bIter.Begin();
@@ -101,7 +101,7 @@ MRIBiasEnergyFunction<TImage, TImageMask, TBiasField>::GetValue(const Parameters
101101
}
102102
else
103103
{
104-
ImageRegionIterator<MaskType> mIter(m_Mask, m_Region);
104+
ImageRegionIterator mIter(m_Mask, m_Region);
105105
mIter.GoToBegin();
106106
while (!bIter.IsAtEnd())
107107
{
@@ -536,8 +536,8 @@ MRIBiasFieldCorrectionFilter<TInputImage, TOutputImage, TMaskImage>::CorrectImag
536536
{
537537
itkDebugMacro("Correcting the image ");
538538
using Pixel = InternalImagePixelType;
539-
ImageRegionIterator<InternalImageType> iIter(m_InternalInput, region);
540-
BiasFieldType::SimpleForwardIterator bIter(&bias);
539+
ImageRegionIterator iIter(m_InternalInput, region);
540+
BiasFieldType::SimpleForwardIterator bIter(&bias);
541541

542542
BiasFieldType::DomainSizeType biasSize;
543543
this->GetBiasFieldSize(region, biasSize);
@@ -546,7 +546,7 @@ MRIBiasFieldCorrectionFilter<TInputImage, TOutputImage, TMaskImage>::CorrectImag
546546
if (m_OutputMask.IsNotNull())
547547
{
548548
itkDebugMacro("Output mask is being used");
549-
ImageRegionIterator<ImageMaskType> mIter(m_OutputMask, region);
549+
ImageRegionIterator mIter(m_OutputMask, region);
550550
mIter.GoToBegin();
551551
while (!bIter.IsAtEnd())
552552
{
@@ -783,8 +783,8 @@ MRIBiasFieldCorrectionFilter<TInputImage, TOutputImage, TMaskImage>::Log1PImage(
783783
{
784784
const InternalImageRegionType region = source->GetRequestedRegion();
785785

786-
ImageRegionIterator<InternalImageType> s_iter(source, region);
787-
ImageRegionIterator<InternalImageType> t_iter(target, region);
786+
ImageRegionIterator s_iter(source, region);
787+
ImageRegionIterator t_iter(target, region);
788788

789789
InternalImagePixelType pixel;
790790
while (!s_iter.IsAtEnd())
@@ -812,8 +812,8 @@ MRIBiasFieldCorrectionFilter<TInputImage, TOutputImage, TMaskImage>::ExpImage(In
812812
{
813813
const InternalImageRegionType region = source->GetLargestPossibleRegion();
814814

815-
ImageRegionIterator<InternalImageType> s_iter(source, region);
816-
ImageRegionIterator<InternalImageType> t_iter(target, region);
815+
ImageRegionIterator s_iter(source, region);
816+
ImageRegionIterator t_iter(target, region);
817817

818818
while (!s_iter.IsAtEnd())
819819
{

0 commit comments

Comments
 (0)