X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkCommonGenericFilter.h;h=13491f7f3722ab41d905b7b5ae8e419466ab85fb;hb=7d4e77191e55f668f316ba3ddf0fddb63e59bd25;hp=55d2f94019f3fd83cead0fefe9e97469841d582a;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git diff --git a/common/clitkCommonGenericFilter.h b/common/clitkCommonGenericFilter.h index 55d2f94..13491f7 100644 --- a/common/clitkCommonGenericFilter.h +++ b/common/clitkCommonGenericFilter.h @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.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 @@ -14,10 +14,13 @@ - 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 @@ -32,6 +35,7 @@ namespace clitk { class GenericFilterFunctorBase { public: GenericFilterFunctorBase(FilterType * f) { mFilter = f; } + virtual ~GenericFilterFunctorBase() { delete mFilter; } virtual void Execute()= 0; FilterType * mFilter; }; @@ -57,19 +61,19 @@ namespace clitk { ImageTypesManager(FilterType * f) { mFilter = f; } virtual void DoIt(int dim, int ncomp, std::string pixelname) { - // std::cout << "ImageTypesManager DoIt " << dim << " " << pixelname << std::endl; + //std::cout << "ImageTypesManager DoIt " << dim << " " << pixelname << std::endl; if (mMapOfImageTypeToFunction[dim][ncomp][pixelname]) mMapOfImageTypeToFunction[dim][ncomp][pixelname]->Execute(); } template - void AddNewDimensionAndPixelType() { + void AddNewDimensionAndPixelType() { typedef itk::Image,Dim> InputImageType; mMapOfImageTypeToFunction[Dim][NComp][ GetTypeAsString() ] = new GenericFilterFunctorWithDimAndPixelType(mFilter); } /// Specialization for NComp == 1 template - void AddNewDimensionAndPixelType() { + void AddNewDimensionAndPixelType() { typedef itk::Image InputImageType; mMapOfImageTypeToFunction[Dim][1][ GetTypeAsString() ] = new GenericFilterFunctorWithDimAndPixelType(mFilter);