Skip to content

Commit 350447b

Browse files
committed
STYLE: Use CTAD for Image Iterator variables in hxx files
Used class template argument deduction (CTAD) when declaring variables of an Image Iterator type. Using Notepad++, Replace in Files, doing: Find what: ([^\w]Image\w+Iterator)<.+>[ ]*( \w+[\({]) Replace with: $1$2 Files: itk*.hxx [v] Match case (*) Regular expression Follow-up to pull request InsightSoftwareConsortium#5982 commit b6a38b1 "STYLE: Use CTAD for `ImageRegionIterator` variables in hxx files"
1 parent 6ee4c37 commit 350447b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Modules/Core/Common/include/itkImageAlgorithm.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ ImageAlgorithm::ReferenceCopy(const InputImageType * inIma
3636
{
3737
if (inRegion.GetSize()[0] == outRegion.GetSize()[0])
3838
{
39-
ImageScanlineConstIterator<InputImageType> it(inImage, inRegion);
40-
ImageScanlineIterator ot(outImage, outRegion);
39+
ImageScanlineConstIterator it(inImage, inRegion);
40+
ImageScanlineIterator ot(outImage, outRegion);
4141

4242
while (!it.IsAtEnd())
4343
{

Modules/Filtering/ImageCompare/include/itkSTAPLEImageFilter.hxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ STAPLEImageFilter<TInputImage, TOutputImage>::GenerateData()
8686
itkExceptionStringMacro("One or more input images do not contain matching RequestedRegions");
8787
}
8888

89-
ImageScanlineConstIterator<TInputImage> in(this->GetInput(i), W->GetRequestedRegion());
90-
ImageScanlineIterator<TOutputImage> out(W, W->GetRequestedRegion());
89+
ImageScanlineConstIterator in(this->GetInput(i), W->GetRequestedRegion());
90+
ImageScanlineIterator out(W, W->GetRequestedRegion());
9191

9292
while (!in.IsAtEnd())
9393
{
@@ -110,7 +110,7 @@ STAPLEImageFilter<TInputImage, TOutputImage>::GenerateData()
110110
double N = 0.0;
111111
double g_t = 0.0;
112112
{
113-
ImageScanlineIterator<TOutputImage> out(W, W->GetRequestedRegion());
113+
ImageScanlineIterator out(W, W->GetRequestedRegion());
114114
while (!out.IsAtEnd())
115115
{
116116
while (!out.IsAtEndOfLine())
@@ -130,8 +130,8 @@ STAPLEImageFilter<TInputImage, TOutputImage>::GenerateData()
130130
// Now iterate on estimating specificity and sensitivity
131131
for (unsigned int i = 0; i < number_of_input_files; ++i)
132132
{
133-
ImageScanlineConstIterator<TInputImage> in(this->GetInput(i), W->GetRequestedRegion());
134-
ImageScanlineIterator<TOutputImage> out(W, W->GetRequestedRegion());
133+
ImageScanlineConstIterator in(this->GetInput(i), W->GetRequestedRegion());
134+
ImageScanlineIterator out(W, W->GetRequestedRegion());
135135

136136
double p_num{};
137137
double p_denom{};
@@ -173,7 +173,7 @@ STAPLEImageFilter<TInputImage, TOutputImage>::GenerateData()
173173
D_it[i] = ImageScanlineConstIterator<TInputImage>(this->GetInput(i), W->GetRequestedRegion());
174174
}
175175

176-
ImageScanlineIterator<TOutputImage> out(W, W->GetRequestedRegion());
176+
ImageScanlineIterator out(W, W->GetRequestedRegion());
177177
while (!out.IsAtEnd())
178178
{
179179
while (!out.IsAtEndOfLine())

Modules/Filtering/Smoothing/include/itkBinomialBlurImageFilter.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ BinomialBlurImageFilter<TInputImage, TOutputImage>::GenerateData()
182182
itkDebugMacro("End processing forward dimension " << dim);
183183

184184
//----------------------Reverse pass----------------------
185-
ImageRegionReverseIterator<TTempImage> tempReverseIt(tempPtr, tempPtr->GetRequestedRegion());
185+
ImageRegionReverseIterator tempReverseIt(tempPtr, tempPtr->GetRequestedRegion());
186186

187187
tempReverseIt.GoToBegin();
188188

0 commit comments

Comments
 (0)