X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkBooleanOperatorLabelImageFilter.h;h=523a179f8087f713919883e28194f259b7f4a119;hb=a523f5be1e221995c0d4d29a0077b5e8b984c96d;hp=13a9b748a27b9be6b3816aa0a3196ddd5db930b3;hpb=3c89981c4f78fe15b1087f40e51e37c0c1fb087c;p=clitk.git diff --git a/itk/clitkBooleanOperatorLabelImageFilter.h b/itk/clitkBooleanOperatorLabelImageFilter.h index 13a9b74..523a179 100644 --- a/itk/clitkBooleanOperatorLabelImageFilter.h +++ b/itk/clitkBooleanOperatorLabelImageFilter.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,7 +14,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - ======================================================================-====*/ + ===========================================================================**/ #ifndef CLITKBOOLEANOPERATORLABELIMAGEFILTER_H #define CLITKBOOLEANOPERATORLABELIMAGEFILTER_H @@ -97,17 +97,24 @@ namespace clitk { itkStaticConstMacro(InputImage1Dimension, unsigned int, TInputImage1::ImageDimension); itkStaticConstMacro(InputImage2Dimension, unsigned int, TInputImage2::ImageDimension); itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension); - + + // I dont want to verify inputs information +#if ITK_VERSION_MAJOR <= 4 + virtual void VerifyInputInformation() ITK_OVERRIDE { } +#else + virtual void VerifyInputInformation() const ITK_OVERRIDE { } +#endif + protected: BooleanOperatorLabelImageFilter(); virtual ~BooleanOperatorLabelImageFilter() {} - virtual void GenerateOutputInformation(); - virtual void GenerateInputRequestedRegion(); - virtual void GenerateData(); + virtual void GenerateOutputInformation() ITK_OVERRIDE; + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; + virtual void GenerateData() ITK_OVERRIDE; // Do not release date to keep input in memory and continue ... - virtual void ReleaseInputs() { } + virtual void ReleaseInputs() ITK_OVERRIDE { } Input1ImagePixelType mBackgroundValue1; Input2ImagePixelType mBackgroundValue2;