Skip to content

Commit 88b43bf

Browse files
committed
STYLE: Use auto for declaration of variables initialized by New()
Replaced initializations of the forms `T::Pointer var = T::New()` and `typename T::Pointer var = T::New()` with `auto var = T::New()`, to reduce code redundancy. Using Notepad++ v8.3.3, Find in Files (Regular expression): Find what: typename (\w+)::Pointer[ ]+(\w+) = \1::New\(\); Replace with: auto $2 = $1::New\(\); And then again without `typename`. Following ITK pull request InsightSoftwareConsortium/ITK#2994 commit InsightSoftwareConsortium/ITK@2f291f8 "STYLE: Use `auto` for variables initialized by `New()` in Examples", by Jon Haitz Legarreta Gorroño, merged on 27 December 2021.
1 parent 3bca12f commit 88b43bf

File tree

370 files changed

+997
-997
lines changed

Some content is hidden

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

370 files changed

+997
-997
lines changed

src/Bridge/VtkGlue/ConvertAnRGBitkImageTovtkImageData/Code.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ main(int argc, char * argv[])
4343
const auto input = itk::ReadImage<ImageType>(inputFileName);
4444

4545
using FilterType = itk::ImageToVTKImageFilter<ImageType>;
46-
FilterType::Pointer filter = FilterType::New();
46+
auto filter = FilterType::New();
4747
filter->SetInput(input);
4848

4949
try

src/Bridge/VtkGlue/ConvertAnitkImageTovtkImageData/Code.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ main(int argc, char * argv[])
4141
const auto input = itk::ReadImage<ImageType>(inputFileName);
4242

4343
using FilterType = itk::ImageToVTKImageFilter<ImageType>;
44-
FilterType::Pointer filter = FilterType::New();
44+
auto filter = FilterType::New();
4545
filter->SetInput(input);
4646

4747
try

src/Bridge/VtkGlue/ConvertRGBvtkImageDataToAnitkImage/Code.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ main(int argc, char * argv[])
4646
reader->SetDataScalarTypeToUnsignedChar();
4747

4848
using FilterType = itk::VTKImageToImageFilter<ImageType>;
49-
FilterType::Pointer filter = FilterType::New();
49+
auto filter = FilterType::New();
5050
filter->SetInput(reader->GetOutput());
5151

5252
try

src/Bridge/VtkGlue/ConvertvtkImageDataToAnitkImage/Code.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ main(int argc, char * argv[])
4949
magnitude->Update();
5050

5151
using FilterType = itk::VTKImageToImageFilter<ImageType>;
52-
FilterType::Pointer filter = FilterType::New();
52+
auto filter = FilterType::New();
5353
filter->SetInput(magnitude->GetOutput());
5454

5555
try

src/Bridge/VtkGlue/VTKImageToITKImage/Code.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ main(int argc, char * argv[])
5151

5252
using VTKImageToImageType = itk::VTKImageToImageFilter<ImageType>;
5353

54-
VTKImageToImageType::Pointer vtkImageToImageFilter = VTKImageToImageType::New();
54+
auto vtkImageToImageFilter = VTKImageToImageType::New();
5555
vtkImageToImageFilter->SetInput(luminanceFilter->GetOutput());
5656
// vtkImageToImageFilter->SetInput(reader->GetOutput());
5757
vtkImageToImageFilter->Update();
5858

59-
ImageType::Pointer image = ImageType::New();
59+
auto image = ImageType::New();
6060
image->Graft(vtkImageToImageFilter->GetOutput()); // Need to do this because QuickView can't accept const
6161

6262
#ifdef ENABLE_QUICKVIEW

src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetAsElevationMap/Code.cxx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ main(int argc, char * argv[])
6262
// Generate a binary mask that will be used as initialization for the level
6363
// set evolution.
6464
using BinaryImageType = itk::Image<LevelSetOutputType, Dimension>;
65-
BinaryImageType::Pointer binary = BinaryImageType::New();
65+
auto binary = BinaryImageType::New();
6666
binary->SetRegions(input->GetLargestPossibleRegion());
6767
binary->CopyInformation(input);
6868
binary->Allocate();
@@ -90,19 +90,19 @@ main(int argc, char * argv[])
9090
// convert a binary mask to a level-set function
9191
using BinaryImageToLevelSetType = itk::BinaryImageToLevelSetImageAdaptor<BinaryImageType, LevelSetType>;
9292

93-
BinaryImageToLevelSetType::Pointer adaptor = BinaryImageToLevelSetType::New();
93+
auto adaptor = BinaryImageToLevelSetType::New();
9494
adaptor->SetInputImage(binary);
9595
adaptor->Initialize();
9696
LevelSetType::Pointer levelSet = adaptor->GetLevelSet();
9797

9898
// The Heaviside function
9999
using HeavisideFunctionType = itk::SinRegularizedHeavisideStepFunction<LevelSetRealType, LevelSetRealType>;
100-
HeavisideFunctionType::Pointer heaviside = HeavisideFunctionType::New();
100+
auto heaviside = HeavisideFunctionType::New();
101101
heaviside->SetEpsilon(1.5);
102102

103103
// Create the level set container
104104
using LevelSetContainerType = itk::LevelSetContainer<itk::IdentifierType, LevelSetType>;
105-
LevelSetContainerType::Pointer levelSetContainer = LevelSetContainerType::New();
105+
auto levelSetContainer = LevelSetContainerType::New();
106106
levelSetContainer->SetHeaviside(heaviside);
107107
levelSetContainer->AddLevelSet(0, levelSet);
108108

@@ -111,51 +111,51 @@ main(int argc, char * argv[])
111111
// // Chan and Vese internal term
112112
using ChanAndVeseInternalTermType =
113113
itk::LevelSetEquationChanAndVeseInternalTerm<InputImageType, LevelSetContainerType>;
114-
ChanAndVeseInternalTermType::Pointer cvInternalTerm = ChanAndVeseInternalTermType::New();
114+
auto cvInternalTerm = ChanAndVeseInternalTermType::New();
115115
cvInternalTerm->SetInput(input);
116116
cvInternalTerm->SetCoefficient(0.5);
117117

118118
// // Chan and Vese external term
119119
using ChanAndVeseExternalTermType =
120120
itk::LevelSetEquationChanAndVeseExternalTerm<InputImageType, LevelSetContainerType>;
121-
ChanAndVeseExternalTermType::Pointer cvExternalTerm = ChanAndVeseExternalTermType::New();
121+
auto cvExternalTerm = ChanAndVeseExternalTermType::New();
122122
cvExternalTerm->SetInput(input);
123123

124124
// Create term container (equation rhs)
125125
using TermContainerType = itk::LevelSetEquationTermContainer<InputImageType, LevelSetContainerType>;
126-
TermContainerType::Pointer termContainer = TermContainerType::New();
126+
auto termContainer = TermContainerType::New();
127127
termContainer->SetLevelSetContainer(levelSetContainer);
128128
termContainer->SetInput(input);
129129
termContainer->AddTerm(0, cvInternalTerm);
130130
termContainer->AddTerm(1, cvExternalTerm);
131131

132132
// Create equation container
133133
using EquationContainerType = itk::LevelSetEquationContainer<TermContainerType>;
134-
EquationContainerType::Pointer equationContainer = EquationContainerType::New();
134+
auto equationContainer = EquationContainerType::New();
135135
equationContainer->SetLevelSetContainer(levelSetContainer);
136136
equationContainer->AddEquation(0, termContainer);
137137

138138
// Create stopping criteria
139139
using StoppingCriterionType = itk::LevelSetEvolutionNumberOfIterationsStoppingCriterion<LevelSetContainerType>;
140-
StoppingCriterionType::Pointer criterion = StoppingCriterionType::New();
140+
auto criterion = StoppingCriterionType::New();
141141
criterion->SetNumberOfIterations(numberOfIterations);
142142

143143
// Create the visualizer
144144
using VisualizationType = itk::VTKVisualize2DLevelSetAsElevationMap<InputImageType, LevelSetType>;
145-
VisualizationType::Pointer visualizer = VisualizationType::New();
145+
auto visualizer = VisualizationType::New();
146146
visualizer->SetInputImage(input);
147147
visualizer->SetLevelSet(levelSet);
148148
visualizer->SetScreenCapture(true);
149149

150150
// Create evolution class
151151
using LevelSetEvolutionType = itk::LevelSetEvolution<EquationContainerType, LevelSetType>;
152-
LevelSetEvolutionType::Pointer evolution = LevelSetEvolutionType::New();
152+
auto evolution = LevelSetEvolutionType::New();
153153
evolution->SetEquationContainer(equationContainer);
154154
evolution->SetStoppingCriterion(criterion);
155155
evolution->SetLevelSetContainer(levelSetContainer);
156156

157157
using IterationUpdateCommandType = itk::LevelSetIterationUpdateCommand<LevelSetEvolutionType, VisualizationType>;
158-
IterationUpdateCommandType::Pointer iterationUpdateCommand = IterationUpdateCommandType::New();
158+
auto iterationUpdateCommand = IterationUpdateCommandType::New();
159159
iterationUpdateCommand->SetFilterToUpdate(visualizer);
160160
iterationUpdateCommand->SetUpdatePeriod(5);
161161

src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetZeroSet/Code.cxx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ main(int argc, char * argv[])
6262
// Generate a binary mask that will be used as initialization for the level
6363
// set evolution.
6464
using BinaryImageType = itk::Image<LevelSetOutputType, Dimension>;
65-
BinaryImageType::Pointer binary = BinaryImageType::New();
65+
auto binary = BinaryImageType::New();
6666
binary->SetRegions(input->GetLargestPossibleRegion());
6767
binary->CopyInformation(input);
6868
binary->Allocate();
@@ -90,19 +90,19 @@ main(int argc, char * argv[])
9090
// convert a binary mask to a level-set function
9191
using BinaryImageToLevelSetType = itk::BinaryImageToLevelSetImageAdaptor<BinaryImageType, LevelSetType>;
9292

93-
BinaryImageToLevelSetType::Pointer adaptor = BinaryImageToLevelSetType::New();
93+
auto adaptor = BinaryImageToLevelSetType::New();
9494
adaptor->SetInputImage(binary);
9595
adaptor->Initialize();
9696
LevelSetType::Pointer levelSet = adaptor->GetModifiableLevelSet();
9797

9898
// The Heaviside function
9999
using HeavisideFunctionType = itk::SinRegularizedHeavisideStepFunction<LevelSetRealType, LevelSetRealType>;
100-
HeavisideFunctionType::Pointer heaviside = HeavisideFunctionType::New();
100+
auto heaviside = HeavisideFunctionType::New();
101101
heaviside->SetEpsilon(1.5);
102102

103103
// Create the level set container
104104
using LevelSetContainerType = itk::LevelSetContainer<itk::IdentifierType, LevelSetType>;
105-
LevelSetContainerType::Pointer levelSetContainer = LevelSetContainerType::New();
105+
auto levelSetContainer = LevelSetContainerType::New();
106106
levelSetContainer->SetHeaviside(heaviside);
107107
levelSetContainer->AddLevelSet(0, levelSet);
108108

@@ -111,51 +111,51 @@ main(int argc, char * argv[])
111111
// // Chan and Vese internal term
112112
using ChanAndVeseInternalTermType =
113113
itk::LevelSetEquationChanAndVeseInternalTerm<InputImageType, LevelSetContainerType>;
114-
ChanAndVeseInternalTermType::Pointer cvInternalTerm = ChanAndVeseInternalTermType::New();
114+
auto cvInternalTerm = ChanAndVeseInternalTermType::New();
115115
cvInternalTerm->SetInput(input);
116116
cvInternalTerm->SetCoefficient(0.5);
117117

118118
// // Chan and Vese external term
119119
using ChanAndVeseExternalTermType =
120120
itk::LevelSetEquationChanAndVeseExternalTerm<InputImageType, LevelSetContainerType>;
121-
ChanAndVeseExternalTermType::Pointer cvExternalTerm = ChanAndVeseExternalTermType::New();
121+
auto cvExternalTerm = ChanAndVeseExternalTermType::New();
122122
cvExternalTerm->SetInput(input);
123123

124124
// Create term container (equation rhs)
125125
using TermContainerType = itk::LevelSetEquationTermContainer<InputImageType, LevelSetContainerType>;
126-
TermContainerType::Pointer termContainer = TermContainerType::New();
126+
auto termContainer = TermContainerType::New();
127127
termContainer->SetLevelSetContainer(levelSetContainer);
128128
termContainer->SetInput(input);
129129
termContainer->AddTerm(0, cvInternalTerm);
130130
termContainer->AddTerm(1, cvExternalTerm);
131131

132132
// Create equation container
133133
using EquationContainerType = itk::LevelSetEquationContainer<TermContainerType>;
134-
EquationContainerType::Pointer equationContainer = EquationContainerType::New();
134+
auto equationContainer = EquationContainerType::New();
135135
equationContainer->SetLevelSetContainer(levelSetContainer);
136136
equationContainer->AddEquation(0, termContainer);
137137

138138
// Create stopping criteria
139139
using StoppingCriterionType = itk::LevelSetEvolutionNumberOfIterationsStoppingCriterion<LevelSetContainerType>;
140-
StoppingCriterionType::Pointer criterion = StoppingCriterionType::New();
140+
auto criterion = StoppingCriterionType::New();
141141
criterion->SetNumberOfIterations(numberOfIterations);
142142

143143
// Create the visualizer
144144
using VisualizationType = itk::VTKVisualizeImageLevelSetIsoValues<InputImageType, LevelSetType>;
145-
VisualizationType::Pointer visualizer = VisualizationType::New();
145+
auto visualizer = VisualizationType::New();
146146
visualizer->SetInputImage(input);
147147
visualizer->SetLevelSet(levelSet);
148148
visualizer->SetScreenCapture(true);
149149

150150
// Create evolution class
151151
using LevelSetEvolutionType = itk::LevelSetEvolution<EquationContainerType, LevelSetType>;
152-
LevelSetEvolutionType::Pointer evolution = LevelSetEvolutionType::New();
152+
auto evolution = LevelSetEvolutionType::New();
153153
evolution->SetEquationContainer(equationContainer);
154154
evolution->SetStoppingCriterion(criterion);
155155
evolution->SetLevelSetContainer(levelSetContainer);
156156

157157
using IterationUpdateCommandType = itk::LevelSetIterationUpdateCommand<LevelSetEvolutionType, VisualizationType>;
158-
IterationUpdateCommandType::Pointer iterationUpdateCommand = IterationUpdateCommandType::New();
158+
auto iterationUpdateCommand = IterationUpdateCommandType::New();
159159
iterationUpdateCommand->SetFilterToUpdate(visualizer);
160160
iterationUpdateCommand->SetUpdatePeriod(5);
161161

src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetAsElevationMap/Code.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,29 +60,29 @@ main(int argc, char * argv[])
6060
// Generate a binary mask that will be used as initialization for the level
6161
// set evolution.
6262
using OtsuFilterType = itk::OtsuMultipleThresholdsImageFilter<InputImageType, LevelSetImageType>;
63-
OtsuFilterType::Pointer otsu = OtsuFilterType::New();
63+
auto otsu = OtsuFilterType::New();
6464
otsu->SetInput(input);
6565
otsu->SetNumberOfHistogramBins(256);
6666
otsu->SetNumberOfThresholds(1);
6767

6868
using RescaleType = itk::RescaleIntensityImageFilter<LevelSetImageType, LevelSetImageType>;
69-
RescaleType::Pointer rescaler = RescaleType::New();
69+
auto rescaler = RescaleType::New();
7070
rescaler->SetInput(otsu->GetOutput());
7171
rescaler->SetOutputMinimum(0);
7272
rescaler->SetOutputMaximum(1);
7373

7474
// convert a binary mask to a level-set function
7575
using BinaryImageToLevelSetType = itk::BinaryImageToLevelSetImageAdaptor<LevelSetImageType, LevelSetType>;
7676

77-
BinaryImageToLevelSetType::Pointer adaptor = BinaryImageToLevelSetType::New();
77+
auto adaptor = BinaryImageToLevelSetType::New();
7878
adaptor->SetInputImage(rescaler->GetOutput());
7979
adaptor->Initialize();
8080

8181
LevelSetType::Pointer levelSet = adaptor->GetModifiableLevelSet();
8282

8383
// Create the visualizer
8484
using VisualizationType = itk::VTKVisualize2DLevelSetAsElevationMap<InputImageType, LevelSetType>;
85-
VisualizationType::Pointer visualizer = VisualizationType::New();
85+
auto visualizer = VisualizationType::New();
8686
visualizer->SetInputImage(input);
8787
visualizer->SetLevelSet(levelSet);
8888

src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetZeroSet/Code.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,29 +60,29 @@ main(int argc, char * argv[])
6060
// Generate a binary mask that will be used as initialization for the level
6161
// set evolution.
6262
using OtsuFilterType = itk::OtsuMultipleThresholdsImageFilter<InputImageType, LevelSetImageType>;
63-
OtsuFilterType::Pointer otsu = OtsuFilterType::New();
63+
auto otsu = OtsuFilterType::New();
6464
otsu->SetInput(input);
6565
otsu->SetNumberOfHistogramBins(256);
6666
otsu->SetNumberOfThresholds(1);
6767

6868
using RescaleType = itk::RescaleIntensityImageFilter<LevelSetImageType, LevelSetImageType>;
69-
RescaleType::Pointer rescaler = RescaleType::New();
69+
auto rescaler = RescaleType::New();
7070
rescaler->SetInput(otsu->GetOutput());
7171
rescaler->SetOutputMinimum(0);
7272
rescaler->SetOutputMaximum(1);
7373

7474
// convert a binary mask to a level-set function
7575
using BinaryImageToLevelSetType = itk::BinaryImageToLevelSetImageAdaptor<LevelSetImageType, LevelSetType>;
7676

77-
BinaryImageToLevelSetType::Pointer adaptor = BinaryImageToLevelSetType::New();
77+
auto adaptor = BinaryImageToLevelSetType::New();
7878
adaptor->SetInputImage(rescaler->GetOutput());
7979
adaptor->Initialize();
8080

8181
LevelSetType::Pointer levelSet = adaptor->GetModifiableLevelSet();
8282

8383
// Create the visualizer
8484
using VisualizationType = itk::VTKVisualizeImageLevelSetIsoValues<InputImageType, LevelSetType>;
85-
VisualizationType::Pointer visualizer = VisualizationType::New();
85+
auto visualizer = VisualizationType::New();
8686
visualizer->SetInputImage(input);
8787
visualizer->SetLevelSet(levelSet);
8888

src/Bridge/VtkGlue/VisualizeStaticMalcolm2DLevelSetLayers/Code.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,29 @@ main(int argc, char * argv[])
5050
// Generate a binary mask that will be used as initialization for the level
5151
// set evolution.
5252
using OtsuFilterType = itk::OtsuMultipleThresholdsImageFilter<InputImageType, InputImageType>;
53-
OtsuFilterType::Pointer otsu = OtsuFilterType::New();
53+
auto otsu = OtsuFilterType::New();
5454
otsu->SetInput(input);
5555
otsu->SetNumberOfHistogramBins(256);
5656
otsu->SetNumberOfThresholds(1);
5757

5858
using RescaleType = itk::RescaleIntensityImageFilter<InputImageType, InputImageType>;
59-
RescaleType::Pointer rescaler = RescaleType::New();
59+
auto rescaler = RescaleType::New();
6060
rescaler->SetInput(otsu->GetOutput());
6161
rescaler->SetOutputMinimum(0);
6262
rescaler->SetOutputMaximum(1);
6363

6464
// convert a binary mask to a level-set function
6565
using BinaryImageToLevelSetType = itk::BinaryImageToLevelSetImageAdaptor<InputImageType, LevelSetType>;
6666

67-
BinaryImageToLevelSetType::Pointer adaptor = BinaryImageToLevelSetType::New();
67+
auto adaptor = BinaryImageToLevelSetType::New();
6868
adaptor->SetInputImage(rescaler->GetOutput());
6969
adaptor->Initialize();
7070

7171
LevelSetType::Pointer levelSet = adaptor->GetModifiableLevelSet();
7272

7373
// Create the visualizer
7474
using VisualizationType = itk::VTKVisualize2DSparseLevelSetLayers<InputImageType, LevelSetType>;
75-
VisualizationType::Pointer visualizer = VisualizationType::New();
75+
auto visualizer = VisualizationType::New();
7676
visualizer->SetInputImage(input);
7777
visualizer->SetLevelSet(levelSet);
7878
visualizer->SetScreenCapture(true);

0 commit comments

Comments
 (0)