X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkCommonGenericFilter.h;h=b75c1b7e49210b52f6614d861061d4f3f6a05313;hb=b1f5d6c99d0263700df2ddb2c6d1bf348709cd92;hp=55d2f94019f3fd83cead0fefe9e97469841d582a;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git diff --git a/common/clitkCommonGenericFilter.h b/common/clitkCommonGenericFilter.h index 55d2f94..b75c1b7 100644 --- a/common/clitkCommonGenericFilter.h +++ b/common/clitkCommonGenericFilter.h @@ -15,9 +15,12 @@ - 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; }; @@ -62,14 +66,14 @@ namespace clitk { 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);