changes in license header

[clitk.git] / common / clitkCommonGenericFilter.h

diff --git a/common/clitkCommonGenericFilter.h b/common/clitkCommonGenericFilter.h
index 952c90b0df3c2902811bad65c5412bd5bf339aac..fe04c5dafb821b312681c6f1ddff5cb1bf184392 100644 (file)
--- a/common/clitkCommonGenericFilter.h
+++ b/common/clitkCommonGenericFilter.h
@@ -1,6 +1,26 @@
+/*=========================================================================
+  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://www.centreleonberard.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 CLITKCOMMONGENERICFILTER_H
 #define CLITKCOMMONGENERICFILTER_H
+
 #include "clitkCommon.h"
+#include "clitkFilterBase.h"
 
 /*--------------------------------------------------------------------
   DISCLAIMER : I obviously know how to make this mess much clearer and
@@ -15,6 +35,7 @@ namespace clitk {
   class GenericFilterFunctorBase {
   public:
     GenericFilterFunctorBase(FilterType * f) { mFilter = f; }
+    virtual ~GenericFilterFunctorBase() { delete mFilter; }
     virtual void Execute()= 0;
     FilterType * mFilter;
   };
@@ -45,14 +66,14 @@ namespace clitk {
         mMapOfImageTypeToFunction[dim][ncomp][pixelname]->Execute();
     }
     template<unsigned int Dim, unsigned int NComp, class PixelType>
-    void AddNewDimensionAndPixelType() {
+      void AddNewDimensionAndPixelType() {
         typedef itk::Image<itk::Vector<PixelType,NComp>,Dim> InputImageType;
         mMapOfImageTypeToFunction[Dim][NComp][ GetTypeAsString<PixelType>() ] = 
             new GenericFilterFunctorWithDimAndPixelType<FilterType, InputImageType>(mFilter);
     }
     /// Specialization for NComp == 1
     template<unsigned int Dim, class PixelType>
-    void AddNewDimensionAndPixelType() {
+      void AddNewDimensionAndPixelType() {
         typedef itk::Image<PixelType,Dim> InputImageType;
         mMapOfImageTypeToFunction[Dim][1][ GetTypeAsString<PixelType>() ] = 
             new GenericFilterFunctorWithDimAndPixelType<FilterType, InputImageType>(mFilter);