X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=filters%2FclitkImageConvertGenericFilter.h;h=19caaefec6916465e453f0a3fe56bc78cfeb5d6d;hb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;hp=50f80ef51d042b5fa7a062b06a2d7112e026bf88;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git

diff --git a/filters/clitkImageConvertGenericFilter.h b/filters/clitkImageConvertGenericFilter.h
index 50f80ef..19caaef 100644
--- a/filters/clitkImageConvertGenericFilter.h
+++ b/filters/clitkImageConvertGenericFilter.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 CLITKIMAGECONVERTGENERICFILTER_H
 #define CLITKIMAGECONVERTGENERICFILTER_H
-
 /**
  ===================================================================
  * @file   clitkImageConvertGenericFilter.h
@@ -19,7 +35,8 @@
 
 namespace clitk {
   
-  class ImageConvertGenericFilter: public clitk::ImageToImageGenericFilter {
+  class ImageConvertGenericFilter: 
+    public clitk::ImageToImageGenericFilter<ImageConvertGenericFilter> {
     
   public: 
     // constructor - destructor
@@ -27,7 +44,6 @@ namespace clitk {
 
     // Types
     typedef ImageConvertGenericFilter     Self;
-    typedef ImageToImageGenericFilter     Superclass;
     typedef itk::SmartPointer<Self>       Pointer;
     typedef itk::SmartPointer<const Self> ConstPointer;
 
@@ -36,18 +52,21 @@ namespace clitk {
     
     // Members functions
     void SetOutputPixelType(std::string p) { mOutputPixelTypeName = p; }
-    void Update();
+
+    //--------------------------------------------------------------------
+    // Main function called each time the filter is updated
+    template<class InputImageType>  
+    void UpdateWithInputImageType();
 
   protected:
+    template<unsigned int Dim> void InitializeImageType();
     std::string mOutputPixelTypeName;
 
-    template<unsigned int Dim> void Update_WithDim();
-    template<unsigned int Dim, class PixelType> void Update_WithDimAndPixelType();
-    template<unsigned int Dim, class PixelType, class OutputPixelType> void Update_WithDimAndPixelTypeAndOutputType();
+    template<class InputImageType, class OutputPixelType> void UpdateWithOutputType();
 
   }; // end class ImageConvertGenericFilter
 
-#include "clitkImageConvertGenericFilter.txx"
+  //#include "clitkImageConvertGenericFilter.txx"
 
 } // end namespace