diff --git a/src/Bridge/VtkGlue/ConvertAnRGBitkImageTovtkImageData/Code.cxx b/src/Bridge/VtkGlue/ConvertAnRGBitkImageTovtkImageData/Code.cxx index 68ce499ca..38acbb1aa 100644 --- a/src/Bridge/VtkGlue/ConvertAnRGBitkImageTovtkImageData/Code.cxx +++ b/src/Bridge/VtkGlue/ConvertAnRGBitkImageTovtkImageData/Code.cxx @@ -40,13 +40,11 @@ main(int argc, char * argv[]) using PixelType = itk::RGBPixel; using ImageType = itk::Image; - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(inputFileName); + const auto input = itk::ReadImage(inputFileName); using FilterType = itk::ImageToVTKImageFilter; FilterType::Pointer filter = FilterType::New(); - filter->SetInput(reader->GetOutput()); + filter->SetInput(input); try { diff --git a/src/Bridge/VtkGlue/ConvertAnitkImageTovtkImageData/Code.cxx b/src/Bridge/VtkGlue/ConvertAnitkImageTovtkImageData/Code.cxx index 95e9bd271..1ce99227d 100644 --- a/src/Bridge/VtkGlue/ConvertAnitkImageTovtkImageData/Code.cxx +++ b/src/Bridge/VtkGlue/ConvertAnitkImageTovtkImageData/Code.cxx @@ -38,13 +38,11 @@ main(int argc, char * argv[]) using PixelType = unsigned char; using ImageType = itk::Image; - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(inputFileName); + const auto input = itk::ReadImage(inputFileName); using FilterType = itk::ImageToVTKImageFilter; FilterType::Pointer filter = FilterType::New(); - filter->SetInput(reader->GetOutput()); + filter->SetInput(input); try { diff --git a/src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetAsElevationMap/Code.cxx b/src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetAsElevationMap/Code.cxx index 6d95b4a4c..b33b96beb 100644 --- a/src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetAsElevationMap/Code.cxx +++ b/src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetAsElevationMap/Code.cxx @@ -48,13 +48,7 @@ main(int argc, char * argv[]) using InputPixelType = unsigned char; using InputImageType = itk::Image; - // Read input image (to be processed). - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(argv[1]); - reader->Update(); - - InputImageType::Pointer input = reader->GetOutput(); + InputImageType::Pointer input = itk::ReadImage(argv[1]); int numberOfIterations = std::stoi(argv[2]); diff --git a/src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetZeroSet/Code.cxx b/src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetZeroSet/Code.cxx index 4baad5a91..2053971b4 100644 --- a/src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetZeroSet/Code.cxx +++ b/src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetZeroSet/Code.cxx @@ -48,13 +48,7 @@ main(int argc, char * argv[]) using InputPixelType = unsigned char; using InputImageType = itk::Image; - // Read input image (to be processed). - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(argv[1]); - reader->Update(); - - InputImageType::Pointer input = reader->GetOutput(); + InputImageType::Pointer input = itk::ReadImage(argv[1]); int numberOfIterations = std::stoi(argv[2]); diff --git a/src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetAsElevationMap/Code.cxx b/src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetAsElevationMap/Code.cxx index edffde2bc..d28bf416e 100644 --- a/src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetAsElevationMap/Code.cxx +++ b/src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetAsElevationMap/Code.cxx @@ -51,12 +51,7 @@ main(int argc, char * argv[]) using InputPixelType = unsigned char; using InputImageType = itk::Image; - // Read input image (to be processed). - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(argv[1]); - - InputImageType::Pointer input = reader->GetOutput(); + InputImageType::Pointer input = itk::ReadImage(argv[1]); using LevelSetPixelType = float; using LevelSetImageType = itk::Image; diff --git a/src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetZeroSet/Code.cxx b/src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetZeroSet/Code.cxx index 4a18674c4..bc7470e4c 100644 --- a/src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetZeroSet/Code.cxx +++ b/src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetZeroSet/Code.cxx @@ -51,12 +51,7 @@ main(int argc, char * argv[]) using InputPixelType = unsigned char; using InputImageType = itk::Image; - // Read input image (to be processed). - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(argv[1]); - - InputImageType::Pointer input = reader->GetOutput(); + InputImageType::Pointer input = itk::ReadImage(argv[1]); using LevelSetPixelType = float; using LevelSetImageType = itk::Image; diff --git a/src/Bridge/VtkGlue/VisualizeStaticMalcolm2DLevelSetLayers/Code.cxx b/src/Bridge/VtkGlue/VisualizeStaticMalcolm2DLevelSetLayers/Code.cxx index ab8e9235f..3b7ef6925 100644 --- a/src/Bridge/VtkGlue/VisualizeStaticMalcolm2DLevelSetLayers/Code.cxx +++ b/src/Bridge/VtkGlue/VisualizeStaticMalcolm2DLevelSetLayers/Code.cxx @@ -43,12 +43,7 @@ main(int argc, char * argv[]) using InputPixelType = unsigned char; using InputImageType = itk::Image; - // Read input image (to be processed). - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(argv[1]); - - InputImageType::Pointer input = reader->GetOutput(); + InputImageType::Pointer input = itk::ReadImage(argv[1]); using LevelSetType = itk::MalcolmSparseLevelSetImage; diff --git a/src/Bridge/VtkGlue/VisualizeStaticShi2DLevelSetLayers/Code.cxx b/src/Bridge/VtkGlue/VisualizeStaticShi2DLevelSetLayers/Code.cxx index 40517f1e5..278bb22d8 100644 --- a/src/Bridge/VtkGlue/VisualizeStaticShi2DLevelSetLayers/Code.cxx +++ b/src/Bridge/VtkGlue/VisualizeStaticShi2DLevelSetLayers/Code.cxx @@ -43,13 +43,7 @@ main(int argc, char * argv[]) using InputPixelType = unsigned char; using InputImageType = itk::Image; - // Read input image (to be processed). - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(argv[1]); - reader->Update(); - - InputImageType::Pointer input = reader->GetOutput(); + InputImageType::Pointer input = itk::ReadImage(argv[1]); using LevelSetType = itk::ShiSparseLevelSetImage; diff --git a/src/Bridge/VtkGlue/VisualizeStaticWhitaker2DLevelSetLayers/Code.cxx b/src/Bridge/VtkGlue/VisualizeStaticWhitaker2DLevelSetLayers/Code.cxx index a40e391d7..afc5eb1f9 100644 --- a/src/Bridge/VtkGlue/VisualizeStaticWhitaker2DLevelSetLayers/Code.cxx +++ b/src/Bridge/VtkGlue/VisualizeStaticWhitaker2DLevelSetLayers/Code.cxx @@ -43,12 +43,7 @@ main(int argc, char * argv[]) using InputPixelType = unsigned char; using InputImageType = itk::Image; - // Read input image (to be processed). - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(argv[1]); - - InputImageType::Pointer input = reader->GetOutput(); + InputImageType::Pointer input = itk::ReadImage(argv[1]); using LevelSetPixelType = float; using LevelSetType = itk::WhitakerSparseLevelSetImage; diff --git a/src/Developer/Exceptions.cxx b/src/Developer/Exceptions.cxx index ede7f60b7..1404afcc9 100644 --- a/src/Developer/Exceptions.cxx +++ b/src/Developer/Exceptions.cxx @@ -1,6 +1,4 @@ #include "itkImage.h" -#include "itkImageFileReader.h" -#include "itkImageFileWriter.h" #include "ImageSource.h" diff --git a/src/Developer/ImageFilter.cxx b/src/Developer/ImageFilter.cxx index c9c5873d9..52acba1fa 100644 --- a/src/Developer/ImageFilter.cxx +++ b/src/Developer/ImageFilter.cxx @@ -1,6 +1,4 @@ #include "itkImage.h" -#include "itkImageFileReader.h" -#include "itkImageFileWriter.h" #include "ImageFilter.h" diff --git a/src/Developer/ImageFilterMultipleInputs.cxx b/src/Developer/ImageFilterMultipleInputs.cxx index 1e52c396d..bd76a809b 100644 --- a/src/Developer/ImageFilterMultipleInputs.cxx +++ b/src/Developer/ImageFilterMultipleInputs.cxx @@ -1,6 +1,4 @@ #include "itkImage.h" -#include "itkImageFileReader.h" -#include "itkImageFileWriter.h" #include "ImageFilterMultipleInputs.h" diff --git a/src/Developer/ImageFilterMultipleInputsDifferentType.cxx b/src/Developer/ImageFilterMultipleInputsDifferentType.cxx index f8287bdb4..cff4bdf23 100644 --- a/src/Developer/ImageFilterMultipleInputsDifferentType.cxx +++ b/src/Developer/ImageFilterMultipleInputsDifferentType.cxx @@ -13,21 +13,14 @@ main(int, char *[]) using ScalarImageType = itk::Image; using FilterType = itk::ImageFilterMultipleInputsDifferentType; - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName("Test.jpg"); - reader->Update(); + const auto input = itk::ReadImage("Test.jpg"); // Create and the filter FilterType::Pointer filter = FilterType::New(); - filter->SetInput(reader->GetOutput()); + filter->SetInput(input); filter->Update(); - using WriterType = itk::ImageFileWriter; - WriterType::Pointer writer = WriterType::New(); - writer->SetFileName("TestOutput.jpg"); - writer->SetInput(filter->GetOutput()); - writer->Update(); + itk::WriteImage(filter->GetOutput(), "TestOutput.jpg"); return EXIT_SUCCESS; } diff --git a/src/Developer/ImageFilterMultipleOutputs.cxx b/src/Developer/ImageFilterMultipleOutputs.cxx index 106afd4c4..17c29d1e2 100644 --- a/src/Developer/ImageFilterMultipleOutputs.cxx +++ b/src/Developer/ImageFilterMultipleOutputs.cxx @@ -1,5 +1,4 @@ #include "itkImage.h" -#include "itkImageFileReader.h" #include "itkImageFileWriter.h" #include "ImageFilterMultipleOutputs.h" @@ -15,21 +14,9 @@ main(int, char *[]) FilterType::Pointer filter = FilterType::New(); filter->Update(); - { - using WriterType = itk::ImageFileWriter; - WriterType::Pointer writer = WriterType::New(); - writer->SetFileName("TestOutput1.jpg"); - writer->SetInput(filter->GetOutput1()); - writer->Update(); - } + itk::WriteImage(filter->GetOutput1(), "TestOutput1.jpg"); - { - using WriterType = itk::ImageFileWriter; - WriterType::Pointer writer = WriterType::New(); - writer->SetFileName("TestOutput2.jpg"); - writer->SetInput(filter->GetOutput2()); - writer->Update(); - } + itk::WriteImage(filter->GetOutput2(), "TestOutput2.jpg"); return EXIT_SUCCESS; } diff --git a/src/Developer/ImageFilterMultipleOutputsDifferentType.cxx b/src/Developer/ImageFilterMultipleOutputsDifferentType.cxx index 25564b354..6285ca257 100644 --- a/src/Developer/ImageFilterMultipleOutputsDifferentType.cxx +++ b/src/Developer/ImageFilterMultipleOutputsDifferentType.cxx @@ -17,21 +17,9 @@ main(int, char *[]) FilterType::Pointer filter = FilterType::New(); filter->Update(); - { - using WriterType = itk::ImageFileWriter; - WriterType::Pointer writer = WriterType::New(); - writer->SetFileName("TestOutput1.jpg"); - writer->SetInput(filter->GetOutput1()); - writer->Update(); - } + itk::WriteImage(filter->GetOutput1(), "TestOutput1.jpg"); - { - using WriterType = itk::ImageFileWriter; - WriterType::Pointer writer = WriterType::New(); - writer->SetFileName("TestOutput2.jpg"); - writer->SetInput(filter->GetOutput2()); - writer->Update(); - } + itk::WriteImage(filter->GetOutput2(), "TestOutput2.jpg"); return EXIT_SUCCESS; } diff --git a/src/Developer/InplaceImageFilter.cxx b/src/Developer/InplaceImageFilter.cxx index 670c8e12b..ef523b43a 100644 --- a/src/Developer/InplaceImageFilter.cxx +++ b/src/Developer/InplaceImageFilter.cxx @@ -1,6 +1,4 @@ #include "itkImage.h" -#include "itkImageFileReader.h" -#include "itkImageFileWriter.h" #include "MyInPlaceImageFilter.h" diff --git a/src/Developer/MiniPipeline.cxx b/src/Developer/MiniPipeline.cxx index beb1d9d5b..53d4660bd 100644 --- a/src/Developer/MiniPipeline.cxx +++ b/src/Developer/MiniPipeline.cxx @@ -1,5 +1,4 @@ #include "itkImage.h" -#include "itkImageFileReader.h" #include "itkImageFileWriter.h" #include "ImageFilterY.h" @@ -28,11 +27,7 @@ main(int, char *[]) std::cout << "Input:" << std::endl; std::cout << filter->GetOutput()->GetLargestPossibleRegion() << std::endl; - using WriterType = itk::ImageFileWriter; - WriterType::Pointer writer = WriterType::New(); - writer->SetFileName("Output.png"); - writer->SetInput(filter->GetOutput()); - writer->Update(); + itk::WriteImage(filter->GetOutput(), "Output.png"); return EXIT_SUCCESS; } diff --git a/src/Developer/MultiThreadedImageFilter.cxx b/src/Developer/MultiThreadedImageFilter.cxx index b7bb52a69..0d15d360e 100644 --- a/src/Developer/MultiThreadedImageFilter.cxx +++ b/src/Developer/MultiThreadedImageFilter.cxx @@ -1,6 +1,4 @@ #include "itkImage.h" -#include "itkImageFileReader.h" -#include "itkImageFileWriter.h" #include "MultiThreadedImageFilter.h" diff --git a/src/Developer/OilPaintingImageFilter.cxx b/src/Developer/OilPaintingImageFilter.cxx index 62b7513a3..517747798 100644 --- a/src/Developer/OilPaintingImageFilter.cxx +++ b/src/Developer/OilPaintingImageFilter.cxx @@ -30,20 +30,17 @@ main(int argc, char * argv[]) using ImageType = itk::Image; using FilterType = itk::OilPaintingImageFilter; - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(argv[1]); - reader->Update(); + const auto input = itk::ReadImage(argv[1]); FilterType::Pointer filter = FilterType::New(); - filter->SetInput(reader->GetOutput()); + filter->SetInput(input); filter->SetNumberOfBins(numberOfBins); filter->SetRadius(radius); filter->Update(); #ifdef ENABLE_QUICKVIEW QuickView viewer; - viewer.AddImage(reader->GetOutput(), true, itksys::SystemTools::GetFilenameName(reader->GetFileName())); + viewer.AddImage(input, true, itksys::SystemTools::GetFilenameName(reader->GetFileName())); std::stringstream desc; desc << "OilPaintingImageFilter, bins = " << numberOfBins << " radius = " << radius; diff --git a/src/Developer/SetGetMacro.cxx b/src/Developer/SetGetMacro.cxx index 33e8d8cda..19a5a97d9 100644 --- a/src/Developer/SetGetMacro.cxx +++ b/src/Developer/SetGetMacro.cxx @@ -1,6 +1,4 @@ #include "itkImage.h" -#include "itkImageFileReader.h" -#include "itkImageFileWriter.h" #include "ImageFilterX.h" diff --git a/src/IO/GDCM/ReadDICOMSeriesAndWrite3DImage/Code.cxx b/src/IO/GDCM/ReadDICOMSeriesAndWrite3DImage/Code.cxx index ba6e58c41..7fbbdc2fb 100644 --- a/src/IO/GDCM/ReadDICOMSeriesAndWrite3DImage/Code.cxx +++ b/src/IO/GDCM/ReadDICOMSeriesAndWrite3DImage/Code.cxx @@ -102,9 +102,7 @@ main(int argc, char * argv[]) reader->SetFileNames(fileNames); reader->ForceOrthogonalDirectionOff(); // properly read CTs with gantry tilt - using WriterType = itk::ImageFileWriter; - WriterType::Pointer writer = WriterType::New(); - std::string outFileName; + std::string outFileName; if (argc > 2) { outFileName = argv[2]; @@ -113,13 +111,10 @@ main(int argc, char * argv[]) { outFileName = dirName + std::string("/") + seriesIdentifier + ".nrrd"; } - writer->SetFileName(outFileName); - writer->UseCompressionOn(); - writer->SetInput(reader->GetOutput()); std::cout << "Writing: " << outFileName << std::endl; try { - writer->Update(); + itk::WriteImage(reader->GetOutput(), outFileName, true); // compression } catch (itk::ExceptionObject & ex) { diff --git a/src/IO/ImageBase/ConvertFileFormats/Code.cxx b/src/IO/ImageBase/ConvertFileFormats/Code.cxx index c37017215..633eee6f4 100644 --- a/src/IO/ImageBase/ConvertFileFormats/Code.cxx +++ b/src/IO/ImageBase/ConvertFileFormats/Code.cxx @@ -36,18 +36,11 @@ main(int argc, char * argv[]) using PixelType = unsigned char; using ImageType = itk::Image; - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(argv[1]); - - using WriterType = itk::ImageFileWriter; - WriterType::Pointer writer = WriterType::New(); - writer->SetFileName(argv[2]); - writer->SetInput(reader->GetOutput()); + const auto input = itk::ReadImage(argv[1]); try { - writer->Update(); + itk::WriteImage(input, argv[2]); } catch (itk::ExceptionObject & error) { diff --git a/src/IO/ImageBase/Create3DFromSeriesOf2D/Code.cxx b/src/IO/ImageBase/Create3DFromSeriesOf2D/Code.cxx index c1c7e9abf..594042790 100644 --- a/src/IO/ImageBase/Create3DFromSeriesOf2D/Code.cxx +++ b/src/IO/ImageBase/Create3DFromSeriesOf2D/Code.cxx @@ -36,15 +36,13 @@ main(int argc, char * argv[]) using ImageType = itk::Image; using ReaderType = itk::ImageSeriesReader; - using WriterType = itk::ImageFileWriter; ReaderType::Pointer reader = ReaderType::New(); - WriterType::Pointer writer = WriterType::New(); const unsigned int first = std::stoi(argv[2]); const unsigned int last = std::stoi(argv[3]); - const char * outputFilename = argv[4]; + const char * outputFileName = argv[4]; using NameGeneratorType = itk::NumericSeriesFileNames; @@ -67,11 +65,9 @@ main(int argc, char * argv[]) reader->SetFileNames(names); - writer->SetFileName(outputFilename); - writer->SetInput(reader->GetOutput()); try { - writer->Update(); + itk::WriteImage(reader->GetOutput(), outputFileName); } catch (itk::ExceptionObject & err) { diff --git a/src/IO/ImageBase/GenerateSlicesFromVolume/Code.cxx b/src/IO/ImageBase/GenerateSlicesFromVolume/Code.cxx index cf462a145..103c26dff 100644 --- a/src/IO/ImageBase/GenerateSlicesFromVolume/Code.cxx +++ b/src/IO/ImageBase/GenerateSlicesFromVolume/Code.cxx @@ -44,21 +44,19 @@ main(int argc, char * argv[]) using PixelType = unsigned char; using InputImageType = itk::Image; - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(inputFileName); + const auto input = itk::ReadImage(inputFileName); using OutputPixelType = unsigned char; using RescaleImageType = itk::Image; using RescaleFilterType = itk::RescaleIntensityImageFilter; RescaleFilterType::Pointer rescale = RescaleFilterType::New(); - rescale->SetInput(reader->GetOutput()); + rescale->SetInput(input); rescale->SetOutputMinimum(0); rescale->SetOutputMaximum(255); rescale->UpdateLargestPossibleRegion(); - InputImageType::RegionType region = reader->GetOutput()->GetLargestPossibleRegion(); + InputImageType::RegionType region = input->GetLargestPossibleRegion(); InputImageType::SizeType size = region.GetSize(); itk::NumericSeriesFileNames::Pointer fnames = itk::NumericSeriesFileNames::New(); diff --git a/src/IO/ImageBase/ProcessImageChunks/Code.cxx b/src/IO/ImageBase/ProcessImageChunks/Code.cxx index 8e232743f..d1b129366 100644 --- a/src/IO/ImageBase/ProcessImageChunks/Code.cxx +++ b/src/IO/ImageBase/ProcessImageChunks/Code.cxx @@ -44,11 +44,9 @@ main(int argc, char * argv[]) using PixelType = unsigned char; using ImageType = itk::Image; - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(inputFileName); - reader->UpdateOutputInformation(); - ImageType::RegionType fullRegion = reader->GetOutput()->GetLargestPossibleRegion(); + const auto input = itk::ReadImage(inputFileName); + + ImageType::RegionType fullRegion = input->GetLargestPossibleRegion(); ImageType::SizeType fullSize = fullRegion.GetSize(); // when reading image from file, start index is always 0 @@ -58,7 +56,7 @@ main(int argc, char * argv[]) using MedianType = itk::MedianImageFilter; MedianType::Pointer median = MedianType::New(); - median->SetInput(reader->GetOutput()); + median->SetInput(input); median->SetRadius(2); using WriterType = itk::ImageFileWriter; diff --git a/src/IO/ImageBase/ReadUnknownImageType/Code.cxx b/src/IO/ImageBase/ReadUnknownImageType/Code.cxx index c7c471696..5f06a3de0 100644 --- a/src/IO/ImageBase/ReadUnknownImageType/Code.cxx +++ b/src/IO/ImageBase/ReadUnknownImageType/Code.cxx @@ -17,7 +17,6 @@ *=========================================================================*/ #include "itkImageFileReader.h" -#include "itkImageFileWriter.h" #include "itkImageIOBase.h" template diff --git a/src/Nonunit/Review/GeometricPropertiesOfRegion/Code.cxx b/src/Nonunit/Review/GeometricPropertiesOfRegion/Code.cxx index 8a045f8e7..8b31e737a 100644 --- a/src/Nonunit/Review/GeometricPropertiesOfRegion/Code.cxx +++ b/src/Nonunit/Review/GeometricPropertiesOfRegion/Code.cxx @@ -16,7 +16,6 @@ * *=========================================================================*/ #include "itkImage.h" -#include "itkImageFileWriter.h" #include "itkImageRegionIterator.h" #include "itkImageFileReader.h" #include "itkLabelGeometryImageFilter.h" @@ -57,18 +56,9 @@ main(int argc, char * argv[]) } else if (argc > 3) { - using ImageReaderType = itk::ImageFileReader; - ImageReaderType::Pointer labelReader = ImageReaderType::New(); - labelReader->SetFileName(argv[1]); - labelReader->Update(); + labelImage = itk::ReadImage(argv[1]); - labelImage = labelReader->GetOutput(); - - ImageReaderType::Pointer intensityReader = ImageReaderType::New(); - intensityReader->SetFileName(argv[2]); - intensityReader->Update(); - - intensityImage = intensityReader->GetOutput(); + intensityImage = itk::ReadImage(argv[2]); label = std::stoi(argv[3]); } diff --git a/src/Nonunit/Review/MultiphaseChanAndVeseSparseFieldLevelSetSegmentation/Code.cxx b/src/Nonunit/Review/MultiphaseChanAndVeseSparseFieldLevelSetSegmentation/Code.cxx index 19bc0ec40..6e62b9562 100644 --- a/src/Nonunit/Review/MultiphaseChanAndVeseSparseFieldLevelSetSegmentation/Code.cxx +++ b/src/Nonunit/Review/MultiphaseChanAndVeseSparseFieldLevelSetSegmentation/Code.cxx @@ -71,35 +71,15 @@ main(int argc, char ** argv) LevelSetFunctionType, SharedDataHelperType>; - using LevelSetReaderType = itk::ImageFileReader; - using FeatureReaderType = itk::ImageFileReader; - using WriterType = itk::ImageFileWriter; - using DomainFunctionType = itk::AtanRegularizedHeavisideStepFunction; DomainFunctionType::Pointer domainFunction = DomainFunctionType::New(); domainFunction->SetEpsilon(epsilon); - LevelSetReaderType::Pointer contourReader1 = LevelSetReaderType::New(); - contourReader1->SetFileName(argv[1]); - contourReader1->Update(); - - LevelSetReaderType::Pointer contourReader2 = LevelSetReaderType::New(); - contourReader2->SetFileName(argv[2]); - contourReader2->Update(); - - LevelSetReaderType::Pointer contourReader3 = LevelSetReaderType::New(); - contourReader3->SetFileName(argv[3]); - contourReader3->Update(); - - FeatureReaderType::Pointer featureReader = FeatureReaderType::New(); - featureReader->SetFileName(argv[4]); - featureReader->Update(); - - FeatureImageType::Pointer featureImage = featureReader->GetOutput(); - LevelSetImageType::Pointer contourImage1 = contourReader1->GetOutput(); - LevelSetImageType::Pointer contourImage2 = contourReader2->GetOutput(); - LevelSetImageType::Pointer contourImage3 = contourReader3->GetOutput(); + LevelSetImageType::Pointer contourImage1 = itk::ReadImage(argv[1]); + LevelSetImageType::Pointer contourImage2 = itk::ReadImage(argv[2]); + LevelSetImageType::Pointer contourImage3 = itk::ReadImage(argv[3]); + FeatureImageType::Pointer featureImage = itk::ReadImage(argv[4]); MultiLevelSetType::Pointer levelSetFilter = MultiLevelSetType::New(); levelSetFilter->SetFunctionCount(3); @@ -126,13 +106,9 @@ main(int argc, char ** argv) levelSetFilter->Update(); - WriterType::Pointer writer = WriterType::New(); - writer->SetInput(levelSetFilter->GetOutput()); - writer->SetFileName(argv[5]); - try { - writer->Update(); + itk::WriteImage(levelSetFilter->GetOutput(), argv[5]); } catch (itk::ExceptionObject & excep) { diff --git a/src/Nonunit/Review/SegmentBloodVesselsWithMultiScaleHessianBasedMeasure/Code.cxx b/src/Nonunit/Review/SegmentBloodVesselsWithMultiScaleHessianBasedMeasure/Code.cxx index 2cf03afc6..36ac832b1 100644 --- a/src/Nonunit/Review/SegmentBloodVesselsWithMultiScaleHessianBasedMeasure/Code.cxx +++ b/src/Nonunit/Review/SegmentBloodVesselsWithMultiScaleHessianBasedMeasure/Code.cxx @@ -59,9 +59,7 @@ main(int argc, char * argv[]) using PixelType = float; using ImageType = itk::Image; - using ReaderType = itk::ImageFileReader; - ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(inputFileName); + const auto input = itk::ReadImage(inputFileName); using HessianPixelType = itk::SymmetricSecondRankTensor; using HessianImageType = itk::Image; @@ -76,7 +74,7 @@ main(int argc, char * argv[]) using MultiScaleEnhancementFilterType = itk::MultiScaleHessianBasedMeasureImageFilter; MultiScaleEnhancementFilterType::Pointer multiScaleEnhancementFilter = MultiScaleEnhancementFilterType::New(); - multiScaleEnhancementFilter->SetInput(reader->GetOutput()); + multiScaleEnhancementFilter->SetInput(input); multiScaleEnhancementFilter->SetHessianToMeasureFilter(objectnessFilter); multiScaleEnhancementFilter->SetSigmaStepMethodToLogarithmic(); multiScaleEnhancementFilter->SetSigmaMinimum(sigmaMinimum); @@ -88,14 +86,9 @@ main(int argc, char * argv[]) RescaleFilterType::Pointer rescaleFilter = RescaleFilterType::New(); rescaleFilter->SetInput(multiScaleEnhancementFilter->GetOutput()); - using WriterType = itk::ImageFileWriter; - WriterType::Pointer writer = WriterType::New(); - writer->SetFileName(outputFileName); - writer->SetInput(rescaleFilter->GetOutput()); - try { - writer->Update(); + itk::WriteImage(rescaleFilter->GetOutput(), outputFileName); } catch (itk::ExceptionObject & error) { diff --git a/src/Nonunit/Review/SinglephaseChanAndVeseDenseFieldLevelSetSegmentation/Code.cxx b/src/Nonunit/Review/SinglephaseChanAndVeseDenseFieldLevelSetSegmentation/Code.cxx index d8261003e..0576fe64b 100644 --- a/src/Nonunit/Review/SinglephaseChanAndVeseDenseFieldLevelSetSegmentation/Code.cxx +++ b/src/Nonunit/Review/SinglephaseChanAndVeseDenseFieldLevelSetSegmentation/Code.cxx @@ -93,20 +93,8 @@ main(int argc, char ** argv) DomainFunctionType::Pointer domainFunction = DomainFunctionType::New(); domainFunction->SetEpsilon(epsilon); - // We instantiate reader and writer types in the following lines. - // - using ReaderType = itk::ImageFileReader; - using WriterType = itk::ImageFileWriter; - - ReaderType::Pointer reader = ReaderType::New(); - WriterType::Pointer writer = WriterType::New(); - - reader->SetFileName(argv[1]); - reader->Update(); - writer->SetFileName(argv[2]); - - InternalImageType::Pointer featureImage = reader->GetOutput(); + InternalImageType::Pointer featureImage = itk::ReadImage(argv[1]); // We declare now the type of the FastMarchingImageFilter that // will be used to generate the initial level set in the form of a distance @@ -239,12 +227,9 @@ main(int argc, char ** argv) levelSetFilter->Update(); - - writer->SetInput(levelSetFilter->GetOutput()); - try { - writer->Update(); + itk::WriteImage(levelSetFilter->GetOutput(), argv[1]); } catch (itk::ExceptionObject & excep) { diff --git a/src/Nonunit/Review/SinglephaseChanAndVeseSparseFieldLevelSetSegmentation/Code.cxx b/src/Nonunit/Review/SinglephaseChanAndVeseSparseFieldLevelSetSegmentation/Code.cxx index f729c3cc0..94c1315e6 100644 --- a/src/Nonunit/Review/SinglephaseChanAndVeseSparseFieldLevelSetSegmentation/Code.cxx +++ b/src/Nonunit/Review/SinglephaseChanAndVeseSparseFieldLevelSetSegmentation/Code.cxx @@ -93,20 +93,7 @@ main(int argc, char ** argv) DomainFunctionType::Pointer domainFunction = DomainFunctionType::New(); domainFunction->SetEpsilon(epsilon); - // We instantiate reader and writer types in the following lines. - // - using ReaderType = itk::ImageFileReader; - using WriterType = itk::ImageFileWriter; - - ReaderType::Pointer reader = ReaderType::New(); - WriterType::Pointer writer = WriterType::New(); - - reader->SetFileName(argv[1]); - reader->Update(); - - writer->SetFileName(argv[2]); - - InternalImageType::Pointer featureImage = reader->GetOutput(); + InternalImageType::Pointer featureImage = itk::ReadImage(argv[1]); // We declare now the type of the FastMarchingImageFilter that // will be used to generate the initial level set in the form of a distance @@ -238,11 +225,9 @@ main(int argc, char ** argv) levelSetFilter->Update(); - writer->SetInput(levelSetFilter->GetOutput()); - try { - writer->Update(); + itk::WriteImage(levelSetFilter->GetOutput(), argv[2]); } catch (itk::ExceptionObject & excep) { diff --git a/src/Remote/WikiExamples/DisplayITKImage/Code.cxx b/src/Remote/WikiExamples/DisplayITKImage/Code.cxx index 3e6bd1a02..f914e32ab 100644 --- a/src/Remote/WikiExamples/DisplayITKImage/Code.cxx +++ b/src/Remote/WikiExamples/DisplayITKImage/Code.cxx @@ -40,14 +40,12 @@ main(int argc, char * argv[]) } using ImageType = itk::Image, 2>; - using ReaderType = itk::ImageFileReader; using ConnectorType = itk::ImageToVTKImageFilter; - ReaderType::Pointer reader = ReaderType::New(); ConnectorType::Pointer connector = ConnectorType::New(); - reader->SetFileName(argv[1]); - connector->SetInput(reader->GetOutput()); + const auto input = itk::ReadImage(argv[1]); + connector->SetInput(input); vtkSmartPointer actor = vtkSmartPointer::New(); #if VTK_MAJOR_VERSION <= 5