diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index f06bdb95..0d20bcfe 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -8,7 +8,7 @@ set(ExampleSpecificComponents ) if(NOT ITK_SOURCE_DIR) - find_package(ITK REQUIRED COMPONENTS Montage ITKImageIO ITKTransformIO ITKTestKernel ${ExampleSpecificComponents}) + find_package(ITK 5.2 REQUIRED COMPONENTS Montage ITKImageIO ITKTransformIO ITKTestKernel ${ExampleSpecificComponents}) else() # when being built as part of ITK, ITKImageIO and ITKTransformIO # lists of modules are not yet ready, causing a configure error diff --git a/examples/CompleteMontage.cxx b/examples/CompleteMontage.cxx index 88cfc63a..c368576d 100644 --- a/examples/CompleteMontage.cxx +++ b/examples/CompleteMontage.cxx @@ -33,29 +33,6 @@ #include "itkBilateralImageFilter.h" #include "itkComposeImageFilter.h" -template -typename TImage::Pointer -ReadImage(const char * filename) -{ - using ReaderType = itk::ImageFileReader; - typename ReaderType::Pointer reader = ReaderType::New(); - reader->SetFileName(filename); - reader->Update(); - return reader->GetOutput(); -} - -template -void -WriteImage(const TImage * out, const char * filename, bool compress) -{ - using WriterType = itk::ImageFileWriter; - typename WriterType::Pointer w = WriterType::New(); - w->SetInput(out); - w->SetFileName(filename); - w->SetUseCompression(compress); - w->Update(); -} - template void WriteTransform(const TransformType * transform, std::string filename) @@ -397,7 +374,7 @@ completeMontage(const itk::TileConfiguration & stageTiles, for (size_t t = 0; t < stageTiles.LinearSize(); t++) { std::string filename = inputPath + stageTiles.Tiles[t].FileName; - typename OriginalImageType::Pointer image = ReadImage(filename.c_str()); + typename OriginalImageType::Pointer image = itk::ReadImage(filename.c_str()); typename TileConfig::PointType origin = stageTiles.Tiles[t].Position; std::cout << 'R' << std::flush; @@ -421,7 +398,7 @@ completeMontage(const itk::TileConfiguration & stageTiles, avgSpacing = std::pow(avgSpacing, 1.0 / Dimension); image = denoiseImage(image, avgSpacing); - WriteImage(image.GetPointer(), (outputPath + stageTiles.Tiles[t].FileName + "-bil.nrrd").c_str(), true); + itk::WriteImage(image.GetPointer(), (outputPath + stageTiles.Tiles[t].FileName + "-bil.nrrd").c_str(), true); std::cout << 'D' << std::flush; } @@ -439,7 +416,7 @@ completeMontage(const itk::TileConfiguration & stageTiles, std::string baseFileName = itksys::SystemTools::GetFilenameWithoutLastExtension(stageTiles.Tiles[t].FileName); std::string flatFileName = baseFileName + "-flat" + fileNameExt; actualTiles.Tiles[t].FileName = flatFileName; - WriteImage(image.GetPointer(), (outputPath + flatFileName).c_str(), true); + itk::WriteImage(image.GetPointer(), (outputPath + flatFileName).c_str(), true); } oImages[t] = image; @@ -495,7 +472,7 @@ completeMontage(const itk::TileConfiguration & stageTiles, std::cout << std::endl; std::cout << "Writing the final image..."; - WriteImage(resampleF->GetOutput(), outFilename.c_str(), true); + itk::WriteImage(resampleF->GetOutput(), outFilename.c_str(), true); std::cout << "Done!" << std::endl; }