X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=filters%2FclitkImageResampleGenericFilter.h;h=68586dc2548b4da5c1e4cdc8e83d86b1dd5dde48;hb=32def8dc2a3a571a7e34ac76355800c9e69c4f6a;hp=d4ccc1f776df71d4d6b7d6ed39d3a1bf52b7e3e2;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git

diff --git a/filters/clitkImageResampleGenericFilter.h b/filters/clitkImageResampleGenericFilter.h
index d4ccc1f..68586dc 100644
--- a/filters/clitkImageResampleGenericFilter.h
+++ b/filters/clitkImageResampleGenericFilter.h
@@ -1,6 +1,22 @@
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
+
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
 #ifndef CLITKIMAGERESAMPLEGENERICFILTER_H
 #define CLITKIMAGERESAMPLEGENERICFILTER_H
-
 /**
  -------------------------------------------------------------------
  * @file   clitkImageResampleGenericFilter.h
@@ -11,28 +27,13 @@
  -------------------------------------------------------------------*/
 
 // clitk include
-#include "clitkCommon.h"
-#include "clitkImageCommon.h"
 #include "clitkImageToImageGenericFilter.h"
 
-// itk include
-#include "itkImage.h"
-#include "itkImageFileReader.h"
-#include "itkImageSeriesReader.h"
-#include "itkImageFileWriter.h"
-#include "itkRecursiveGaussianImageFilter.h"
-#include "itkResampleImageFilter.h"
-#include "itkAffineTransform.h"
-#include "itkNearestNeighborInterpolateImageFunction.h"
-#include "itkLinearInterpolateImageFunction.h"
-#include "itkBSplineInterpolateImageFunction.h"
-#include "itkBSplineInterpolateImageFunctionWithLUT.h"
-#include "itkCommand.h"
-
 namespace clitk {
   
   //--------------------------------------------------------------------
-  class ImageResampleGenericFilter: public clitk::ImageToImageGenericFilter {
+  class ImageResampleGenericFilter: 
+    public ImageToImageGenericFilter<ImageResampleGenericFilter> {
     
   public: 
     // constructor
@@ -40,7 +41,6 @@ namespace clitk {
 
     // Types
     typedef ImageResampleGenericFilter    Self;
-    typedef ImageToImageGenericFilter     Superclass;
     typedef itk::SmartPointer<Self>       Pointer;
     typedef itk::SmartPointer<const Self> ConstPointer;
 
@@ -55,7 +55,8 @@ namespace clitk {
     void SetBSplineOrder(int o) { mBSplineOrder = o; }
     void SetBLUTSampling(int b) { mSamplingFactors.resize(1); mSamplingFactors[0] = b; }
 
-    void Update();    
+    //--------------------------------------------------------------------
+    template<class InputImageType> void UpdateWithInputImageType();
 
   protected:
     //--------------------------------------------------------------------
@@ -70,17 +71,12 @@ namespace clitk {
     std::vector<int> mSamplingFactors;
 
     //--------------------------------------------------------------------
-    template<unsigned int Dim> void Update_WithDim();
-    template<unsigned int Dim, class PixelType> void Update_WithDimAndPixelType();
-
-    //--------------------------------------------------------------------
-    template<class ImageType>
-    typename ImageType::Pointer ComputeImage(typename ImageType::Pointer inputImage);
-    
+    template<unsigned int Dim> void InitializeImageTypeWithDim();
+     
   }; // end class ImageResampleGenericFilter
   //--------------------------------------------------------------------
     
-#include "clitkImageResampleGenericFilter.txx"
+  //#include "clitkImageResampleGenericFilter.txx"
 
 } // end namespace
 //--------------------------------------------------------------------