Skip to content

Commit bec7f2d

Browse files
committed
STYLE: Use itk::ReadImage and itk::WriteImage in src/Core examples
1 parent fe75959 commit bec7f2d

File tree

35 files changed

+65
-273
lines changed

35 files changed

+65
-273
lines changed

src/Core/Common/AddNoiseToBinaryImage/Code.cxx

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,14 @@ main(int argc, char * argv[])
3939
}
4040
}
4141
using ImageType = itk::Image<unsigned char, 2>;
42-
using ReaderType = itk::ImageFileReader<ImageType>;
4342
using IteratorType = itk::ImageRandomNonRepeatingIteratorWithIndex<ImageType>;
44-
using WriterType = itk::ImageFileWriter<ImageType>;
4543

4644
// Read the binary file
47-
ReaderType::Pointer reader = ReaderType::New();
48-
reader->SetFileName(argv[1]);
49-
reader->Update();
45+
const auto input = itk::ReadImage<ImageType>(argv[1]);
5046

5147
// At x% of the pixels, add a uniform random value between 0 and 255
52-
IteratorType it(reader->GetOutput(), reader->GetOutput()->GetLargestPossibleRegion());
53-
it.SetNumberOfSamples(reader->GetOutput()->GetLargestPossibleRegion().GetNumberOfPixels() * percent);
48+
IteratorType it(input, input->GetLargestPossibleRegion());
49+
it.SetNumberOfSamples(input->GetLargestPossibleRegion().GetNumberOfPixels() * percent);
5450
std::cout << "Number of random samples: " << it.GetNumberOfSamples() << std::endl;
5551
using GeneratorType = itk::Statistics::MersenneTwisterRandomVariateGenerator;
5652
GeneratorType::Pointer random = GeneratorType::New();
@@ -62,11 +58,7 @@ main(int argc, char * argv[])
6258
++it;
6359
}
6460

65-
// Write the file
66-
WriterType::Pointer writer = WriterType::New();
67-
writer->SetFileName(argv[2]);
68-
writer->SetInput(reader->GetOutput());
69-
writer->Update();
61+
itk::WriteImage(input, argv[2]);
7062

7163
return EXIT_SUCCESS;
7264
}

src/Core/Common/ConvertArrayToImage/Code.cxx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,7 @@ main(int, char *[])
8585
const bool importImageFilterWillOwnTheBuffer = true;
8686
importFilter->SetImportPointer(localBuffer, numberOfPixels, importImageFilterWillOwnTheBuffer);
8787

88-
using WriterType = itk::ImageFileWriter<ImageType>;
89-
WriterType::Pointer writer = WriterType::New();
90-
91-
writer->SetFileName("test.png");
92-
93-
writer->SetInput(importFilter->GetOutput());
94-
writer->Update();
88+
itk::WriteImage(importFilter->GetOutput(), "test.mhd");
9589

9690
return EXIT_SUCCESS;
9791
}

src/Core/Common/DisplayImage/Code.cxx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ main(int argc, char * argv[])
4242
}
4343
else
4444
{
45-
using ReaderType = itk::ImageFileReader<ImageType>;
46-
ReaderType::Pointer reader = ReaderType::New();
47-
reader->SetFileName(argv[1]);
48-
image = reader->GetOutput();
45+
image = itk::ReadImage<ImageType>(argv[1]);
4946
}
5047

5148
using RescaleFilterType = itk::RescaleIntensityImageFilter<ImageType, ImageType>;

src/Core/Common/FindMaxAndMinInImage/Code.cxx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,19 @@ main(int argc, char * argv[])
4646

4747
return EXIT_FAILURE;
4848
}
49-
std::string inputFilename = argv[1];
5049

51-
using ReaderType = itk::ImageFileReader<ImageType>;
52-
ReaderType::Pointer reader = ReaderType::New();
53-
54-
reader->SetFileName(inputFilename.c_str());
55-
reader->Update();
50+
const auto input = itk::ReadImage<ImageType>(argv[1]);
5651

5752
using ImageCalculatorFilterType = itk::MinimumMaximumImageCalculator<ImageType>;
5853

5954
ImageCalculatorFilterType::Pointer imageCalculatorFilter = ImageCalculatorFilterType::New();
60-
imageCalculatorFilter->SetImage(reader->GetOutput());
55+
imageCalculatorFilter->SetImage(input);
6156
imageCalculatorFilter->Compute();
6257

6358
using ConnectorType = itk::ImageToVTKImageFilter<ImageType>;
6459
ConnectorType::Pointer originalConnector = ConnectorType::New();
6560

66-
originalConnector->SetInput(reader->GetOutput());
61+
originalConnector->SetInput(input);
6762

6863
vtkSmartPointer<vtkImageActor> originalActor = vtkSmartPointer<vtkImageActor>::New();
6964
#if VTK_MAJOR_VERSION <= 5

src/Core/Common/GetImageSize/Code.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,8 @@ main(int argc, char * argv[])
3333
using PixelType = unsigned char;
3434

3535
using ImageType = itk::Image<PixelType, 2>;
36-
using ReaderType = itk::ImageFileReader<ImageType>;
3736

38-
ReaderType::Pointer reader = ReaderType::New();
39-
reader->SetFileName(argv[1]);
40-
reader->Update();
41-
42-
ImageType::Pointer image = reader->GetOutput();
37+
ImageType::Pointer image = itk::ReadImage<ImageType>(argv[1]);
4338

4439
ImageType::RegionType region = image->GetLargestPossibleRegion();
4540

src/Core/Common/ImageRegionOverlap/Code.cxx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,9 @@ main(int argc, char * argv[])
136136
++itC;
137137
}
138138

139-
// Writer
140-
using FileWriterType = itk::ImageFileWriter<RGBImageType>;
141-
FileWriterType::Pointer writer = FileWriterType::New();
142-
writer->SetFileName(out_file_name);
143-
writer->SetInput(image);
144-
145139
try
146140
{
147-
writer->Update();
141+
itk::WriteImage(image, out_file_name);
148142
}
149143
catch (itk::ExceptionObject & error)
150144
{

src/Core/Common/InPlaceFilterOfImage/Code.cxx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,7 @@ main(int argc, char * argv[])
4646
return EXIT_FAILURE;
4747
}
4848

49-
std::string inputFilename = argv[1];
50-
51-
using ReaderType = itk::ImageFileReader<ImageType>;
52-
ReaderType::Pointer reader = ReaderType::New();
53-
54-
reader->SetFileName(inputFilename.c_str());
55-
reader->Update();
56-
57-
ImageType::Pointer image = reader->GetOutput();
49+
ImageType::Pointer image = itk::ReadImage<ImageType>(argv[1]);
5850

5951
ApplyThresholding(image);
6052

src/Core/Common/IterateImageStartingAtSeed/Code.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "itkImageFileWriter.h"
2020
#include "itkFloodFilledImageFunctionConditionalIterator.h"
2121
#include "itkBinaryThresholdImageFunction.h"
22-
#include "itkImageFileWriter.h"
2322

2423
using ImageType = itk::Image<unsigned char, 2>;
2524

src/Core/Common/IterateLineThroughImage/Code.cxx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ main(int argc, char * argv[])
4545
}
4646
else
4747
{
48-
using ReaderType = itk::ImageFileReader<ImageType>;
49-
ReaderType::Pointer reader = ReaderType::New();
50-
reader->SetFileName(argv[1]);
51-
reader->Update();
52-
image = reader->GetOutput();
48+
image = itk::ReadImage<ImageType>(argv[1]);
5349
inputFilename = argv[1];
5450
}
5551

src/Core/Common/IterateRegionWithAccessToIndexWithWriteAccess/Code.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,7 @@ main(int argc, char * argv[])
3434

3535
using ImageType = itk::Image<unsigned char, 2>;
3636

37-
using ReaderType = itk::ImageFileReader<ImageType>;
38-
ReaderType::Pointer reader = ReaderType::New();
39-
reader->SetFileName(argv[1]);
40-
reader->Update();
41-
42-
ImageType::Pointer image = reader->GetOutput();
37+
ImageType::Pointer image = itk::ReadImage<ImageType>(argv[1]);
4338

4439
ImageType::SizeType regionSize;
4540
regionSize[0] = 5;

src/Core/Common/IterateRegionWithAccessToIndexWithoutWriteAccess/Code.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,7 @@ main(int argc, char * argv[])
3434

3535
using ImageType = itk::Image<unsigned char, 2>;
3636

37-
using ReaderType = itk::ImageFileReader<ImageType>;
38-
ReaderType::Pointer reader = ReaderType::New();
39-
reader->SetFileName(argv[1]);
40-
reader->Update();
41-
42-
ImageType::Pointer image = reader->GetOutput();
37+
ImageType::Pointer image = itk::ReadImage<ImageType>(argv[1]);
4338

4439
ImageType::SizeType regionSize;
4540
regionSize[0] = 5;

src/Core/Common/IterateRegionWithNeighborhood/Code.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,7 @@ main(int argc, char * argv[])
4141

4242
using ImageType = itk::Image<unsigned char, 2>;
4343

44-
using ReaderType = itk::ImageFileReader<ImageType>;
45-
ReaderType::Pointer reader = ReaderType::New();
46-
reader->SetFileName(argv[1]);
47-
reader->Update();
48-
49-
ImageType::Pointer image = reader->GetOutput();
44+
ImageType::Pointer image = itk::ReadImage<ImageType>(argv[1]);
5045

5146
ImageType::SizeType regionSize;
5247
regionSize[0] = 50;

src/Core/Common/IterateRegionWithWriteAccess/Code.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,7 @@ main(int argc, char * argv[])
4141

4242
using ImageType = itk::Image<unsigned char, 2>;
4343

44-
using ReaderType = itk::ImageFileReader<ImageType>;
45-
ReaderType::Pointer reader = ReaderType::New();
46-
reader->SetFileName(argv[1]);
47-
reader->Update();
48-
49-
ImageType::Pointer image = reader->GetOutput();
44+
ImageType::Pointer image = itk::ReadImage<ImageType>(argv[1]);
5045

5146
ImageType::SizeType regionSize;
5247
regionSize[0] = 5;

src/Core/Common/IterateRegionWithoutWriteAccess/Code.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@ main(int argc, char * argv[])
3030

3131
using ImageType = itk::Image<unsigned char, 2>;
3232

33-
using ReaderType = itk::ImageFileReader<ImageType>;
34-
ReaderType::Pointer reader = ReaderType::New();
35-
reader->SetFileName(argv[1]);
36-
reader->Update();
37-
38-
ImageType::Pointer image = reader->GetOutput();
33+
ImageType::Pointer image = itk::ReadImage<ImageType>(argv[1]);
3934

4035
ImageType::SizeType regionSize;
4136
regionSize[0] = 5;

src/Core/Common/IterateWithNeighborhoodWithoutAccess/Code.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@ main(int argc, char * argv[])
3030

3131
using ImageType = itk::Image<unsigned char, 2>;
3232

33-
using ReaderType = itk::ImageFileReader<ImageType>;
34-
ReaderType::Pointer reader = ReaderType::New();
35-
reader->SetFileName(argv[1]);
36-
reader->Update();
37-
38-
ImageType::Pointer image = reader->GetOutput();
33+
ImageType::Pointer image = itk::ReadImage<ImageType>(argv[1]);
3934

4035
ImageType::SizeType regionSize;
4136
regionSize[0] = 50;

src/Core/Common/MultiThreadOilPainting/Code.cxx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,18 @@ main(int argc, char * argv[])
4747
using ImageType = itk::Image<unsigned char, 2>;
4848
using FilterType = itk::OilPaintingImageFilter<ImageType>;
4949

50-
using ReaderType = itk::ImageFileReader<ImageType>;
51-
ReaderType::Pointer reader = ReaderType::New();
52-
reader->SetFileName(argv[1]);
53-
reader->Update();
50+
std::string inputFileName = argv[1];
51+
const auto input = itk::ReadImage<ImageType>(inputFileName);
5452

5553
FilterType::Pointer filter = FilterType::New();
56-
filter->SetInput(reader->GetOutput());
54+
filter->SetInput(input);
5755
filter->SetNumberOfBins(numberOfBins);
5856
filter->SetRadius(radius);
5957
filter->Update();
6058

6159
#ifdef ENABLE_QUICKVIEW
6260
QuickView viewer;
63-
viewer.AddImage(reader->GetOutput(), true, itksys::SystemTools::GetFilenameName(reader->GetFileName()));
61+
viewer.AddImage(input, true, itksys::SystemTools::GetFilenameName(inputFileName));
6462

6563
std::stringstream desc;
6664
desc << "OilPaintingImageFilter, bins = " << numberOfBins << " radius = " << radius;

src/Core/Common/MultipleInputsOfDifferentType/Code.cxx

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,14 @@ main(int, char *[])
3030
using ScalarImageType = itk::Image<unsigned char, 2>;
3131
using FilterType = itk::ImageFilterMultipleInputsDifferentType<VectorImageType, ScalarImageType>;
3232

33-
using ReaderType = itk::ImageFileReader<VectorImageType>;
34-
ReaderType::Pointer reader = ReaderType::New();
35-
reader->SetFileName("Test.jpg");
36-
reader->Update();
33+
const auto input = itk::ReadImage<VectorImageType>("Test.jpg");
3734

3835
// Create and the filter
3936
FilterType::Pointer filter = FilterType::New();
4037
filter->SetInput(reader->GetOutput());
4138
filter->Update();
4239

43-
using WriterType = itk::ImageFileWriter<VectorImageType>;
44-
WriterType::Pointer writer = WriterType::New();
45-
writer->SetFileName("TestOutput.jpg");
46-
writer->SetInput(filter->GetOutput());
47-
writer->Update();
40+
itk::WriteImage(filter->GetOutput(), "TestOutput.jpg");
4841

4942
return EXIT_SUCCESS;
5043
}

src/Core/Common/MultipleOutputsOfDifferentType/Code.cxx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,9 @@ main(int, char *[])
3434
FilterType::Pointer filter = FilterType::New();
3535
filter->Update();
3636

37-
{
38-
using WriterType = itk::ImageFileWriter<OutputImageType1>;
39-
WriterType::Pointer writer = WriterType::New();
40-
writer->SetFileName("TestOutput1.jpg");
41-
writer->SetInput(filter->GetOutput1());
42-
writer->Update();
43-
}
37+
itk::WriteImage(filter->GetOutput1(), "TestOutput1.jpg");
4438

45-
{
46-
using WriterType = itk::ImageFileWriter<OutputImageType2>;
47-
WriterType::Pointer writer = WriterType::New();
48-
writer->SetFileName("TestOutput2.jpg");
49-
writer->SetInput(filter->GetOutput2());
50-
writer->Update();
51-
}
39+
itk::WriteImage(filter->GetOutput2(), "TestOutput2.jpg");
5240

5341
return EXIT_SUCCESS;
5442
}

src/Core/Common/MultipleOutputsOfSameType/Code.cxx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,9 @@ main(int, char *[])
3232
FilterType::Pointer filter = FilterType::New();
3333
filter->Update();
3434

35-
{
36-
using WriterType = itk::ImageFileWriter<ImageType>;
37-
WriterType::Pointer writer = WriterType::New();
38-
writer->SetFileName("TestOutput1.jpg");
39-
writer->SetInput(filter->GetOutput1());
40-
writer->Update();
41-
}
35+
itk::WriteImage(filter->GetOutput1(), "TestOutput1.jpg");
4236

43-
{
44-
using WriterType = itk::ImageFileWriter<ImageType>;
45-
WriterType::Pointer writer = WriterType::New();
46-
writer->SetFileName("TestOutput2.jpg");
47-
writer->SetInput(filter->GetOutput2());
48-
writer->Update();
49-
}
37+
itk::WriteImage(filter->GetOutput2(), "TestOutput2.jpg");
5038

5139
return EXIT_SUCCESS;
5240
}

src/Core/Common/ReadWriteVectorImage/Code.cxx

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,11 @@ main(int argc, char * argv[])
3939

4040
using ImageType = itk::Image<PixelType, ImageDimension>;
4141

42-
using ReaderType = itk::ImageFileReader<ImageType>;
43-
ReaderType::Pointer reader = ReaderType::New();
44-
reader->SetFileName(argv[1]);
45-
46-
using WriterType = itk::ImageFileWriter<ImageType>;
47-
WriterType::Pointer writer = WriterType::New();
48-
writer->SetFileName(argv[2]);
49-
writer->SetInput(reader->GetOutput());
42+
const auto input = itk::ReadImage<ImageType>(argv[1]);
5043

5144
try
5245
{
53-
writer->Update();
46+
itk::WriteImage(input, argv[2]);
5447
}
5548
catch (itk::ExceptionObject & err)
5649
{

src/Core/Common/SetPixelValueInOneImage/Code.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,9 @@ main(int argc, char * argv[])
105105

106106
image->SetPixel(pixelIndex, 200);
107107

108-
using WriterType = itk::ImageFileWriter<ImageType>;
109-
WriterType::Pointer writer = WriterType::New();
110-
writer->SetInput(image);
111-
writer->SetFileName(argv[1]);
112-
113108
try
114109
{
115-
writer->Update();
110+
itk::WriteImage(image, argv[1]);
116111
}
117112
catch (itk::ExceptionObject & error)
118113
{

0 commit comments

Comments
 (0)