Commit cf1a8917 authored by Julien Michel's avatar Julien Michel
Browse files

ENH: Replace all occurences of otb::WarpImageFilter by itk::WarpImageFilter,...

ENH: Replace all occurences of otb::WarpImageFilter by itk::WarpImageFilter, as otb::WarpImageFilter is now deprecated
parent ae44bfdb
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "otbImageFileReader.h" #include "otbImageFileReader.h"
#include "itkUnaryFunctorImageFilter.h" #include "itkUnaryFunctorImageFilter.h"
#include "itkRecursiveGaussianImageFilter.h" #include "itkRecursiveGaussianImageFilter.h"
#include "otbWarpImageFilter.h" #include "itkWarpImageFilter.h"
#include "itkMeanReciprocalSquareDifferenceImageToImageMetric.h" #include "itkMeanReciprocalSquareDifferenceImageToImageMetric.h"
// Software Guide : BeginCodeSnippet // Software Guide : BeginCodeSnippet
...@@ -252,7 +252,7 @@ int main(int argc, char** argv) ...@@ -252,7 +252,7 @@ int main(int argc, char** argv)
dfWriter->SetFileName(argv[4]); dfWriter->SetFileName(argv[4]);
dfWriter->Update(); dfWriter->Update();
typedef otb::WarpImageFilter<InputImageType, InputImageType, typedef itk::WarpImageFilter<InputImageType, InputImageType,
DisplacementFieldType> WarperType; DisplacementFieldType> WarperType;
WarperType::Pointer warper = WarperType::New(); WarperType::Pointer warper = WarperType::New();
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
// Software Guide : BeginCodeSnippet // Software Guide : BeginCodeSnippet
#include "otbNCCRegistrationFilter.h" #include "otbNCCRegistrationFilter.h"
#include "itkRecursiveGaussianImageFilter.h" #include "itkRecursiveGaussianImageFilter.h"
#include "otbWarpImageFilter.h" #include "itkWarpImageFilter.h"
// Software Guide : EndCodeSnippet // Software Guide : EndCodeSnippet
#include "otbImageOfVectorsToMonoChannelExtractROI.h" #include "otbImageOfVectorsToMonoChannelExtractROI.h"
...@@ -208,7 +208,7 @@ int main(int argc, char** argv) ...@@ -208,7 +208,7 @@ int main(int argc, char** argv)
dfWriter->SetFileName(argv[4]); dfWriter->SetFileName(argv[4]);
dfWriter->Update(); dfWriter->Update();
typedef otb::WarpImageFilter<MovingImageType, MovingImageType, typedef itk::WarpImageFilter<MovingImageType, MovingImageType,
DisplacementFieldType> WarperType; DisplacementFieldType> WarperType;
WarperType::Pointer warper = WarperType::New(); WarperType::Pointer warper = WarperType::New();
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "itkWindowedSincInterpolateImageFunction.h" #include "itkWindowedSincInterpolateImageFunction.h"
#include "itkGradientDescentOptimizer.h" #include "itkGradientDescentOptimizer.h"
#include "otbBSplinesInterpolateDisplacementFieldGenerator.h" #include "otbBSplinesInterpolateDisplacementFieldGenerator.h"
#include "otbWarpImageFilter.h" #include "itkWarpImageFilter.h"
// Software Guide : EndCodeSnippet // Software Guide : EndCodeSnippet
#include "otbImageFileReader.h" #include "otbImageFileReader.h"
...@@ -411,7 +411,7 @@ int main(int argc, char* argv[]) ...@@ -411,7 +411,7 @@ int main(int argc, char* argv[])
// Software Guide : BeginCodeSnippet // Software Guide : BeginCodeSnippet
typedef otb::WarpImageFilter<ImageType, ImageType, typedef itk::WarpImageFilter<ImageType, ImageType,
DisplacementFieldType> ImageWarperType; DisplacementFieldType> ImageWarperType;
// Software Guide : EndCodeSnippet // Software Guide : EndCodeSnippet
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#ifndef __otbStreamingWarpImageFilter_h #ifndef __otbStreamingWarpImageFilter_h
#define __otbStreamingWarpImageFilter_h #define __otbStreamingWarpImageFilter_h
#include "otbWarpImageFilter.h" #include "itkWarpImageFilter.h"
#include "otbStreamingTraits.h" #include "otbStreamingTraits.h"
namespace otb namespace otb
...@@ -47,12 +47,12 @@ namespace otb ...@@ -47,12 +47,12 @@ namespace otb
template <class TInputImage, class TOutputImage, class TDisplacementField> template <class TInputImage, class TOutputImage, class TDisplacementField>
class ITK_EXPORT StreamingWarpImageFilter class ITK_EXPORT StreamingWarpImageFilter
: public otb::WarpImageFilter<TInputImage, TOutputImage, TDisplacementField> : public itk::WarpImageFilter<TInputImage, TOutputImage, TDisplacementField>
{ {
public: public:
/** Standard class typedefs. */ /** Standard class typedefs. */
typedef StreamingWarpImageFilter Self; typedef StreamingWarpImageFilter Self;
typedef otb::WarpImageFilter<TInputImage, TOutputImage, TDisplacementField> Superclass; typedef itk::WarpImageFilter<TInputImage, TOutputImage, TDisplacementField> Superclass;
typedef itk::SmartPointer<Self> Pointer; typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer; typedef itk::SmartPointer<const Self> ConstPointer;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment