X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkCommonGenericFilter.h;h=b75c1b7e49210b52f6614d861061d4f3f6a05313;hb=3451be2e38ff6603113fb95f7498e127707de370;hp=4826263dc65faf6318620272f9ae95bd6120f095;hpb=c324c54e19ace253a5a8f318a0c44cb771cf50c6;p=clitk.git

diff --git a/common/clitkCommonGenericFilter.h b/common/clitkCommonGenericFilter.h
index 4826263..b75c1b7 100644
--- a/common/clitkCommonGenericFilter.h
+++ b/common/clitkCommonGenericFilter.h
@@ -1,36 +1,26 @@
 /*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Program:   clitk
-  Module:    $RCSfile: clitkCommonGenericFilter.h,v $
-  Language:  C++
-  Date:      $Date: 2010/02/09 14:19:28 $
-  Version:   $Revision: 1.3 $
-  Author :   Joel Schaerer <joel.schaerer@creatis.insa-lyon.fr>
-             David Sarrut <david.sarrut@creatis.insa-lyon.fr>
+  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
 
-  Copyright (C) 2008
-  Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-  CREATIS-LRMN 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.
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, version 3 of the License.
+  It is distributed under dual licence
 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-  =========================================================================*/
+  - 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
 
-// clitk include
 #include "clitkCommon.h"
+#include "clitkFilterBase.h"
 
 /*--------------------------------------------------------------------
   DISCLAIMER : I obviously know how to make this mess much clearer and
@@ -45,6 +35,7 @@ namespace clitk {
   class GenericFilterFunctorBase {
   public:
     GenericFilterFunctorBase(FilterType * f) { mFilter = f; }
+    virtual ~GenericFilterFunctorBase() { delete mFilter; }
     virtual void Execute()= 0;
     FilterType * mFilter;
   };
@@ -75,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);