From b07ea516b22fea80f721f2f984c4ae9e3c33ef0a Mon Sep 17 00:00:00 2001 From: tbaudier Date: Fri, 15 Feb 2019 15:00:38 +0100 Subject: [PATCH] With ITK 5.0, itk::ProcessObject::VerifyInputInformation are now declared const --- itk/clitkAddRelativePositionConstraintToLabelImageFilter.h | 4 ++++ itk/clitkBooleanOperatorLabelImageFilter.h | 6 +++++- itk/clitkCropLikeImageFilter.h | 4 ++++ itk/clitkLabelImageOverlapMeasureFilter.h | 6 +++++- itk/clitkPasteImageFilter.h | 4 ++++ 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h b/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h index 45f331e..df05283 100644 --- a/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h +++ b/itk/clitkAddRelativePositionConstraintToLabelImageFilter.h @@ -149,7 +149,11 @@ namespace clitk { typename FloatImageType::Pointer GetFuzzyMap() { return m_FuzzyMap; } // 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 // For debug void PrintOptions(); diff --git a/itk/clitkBooleanOperatorLabelImageFilter.h b/itk/clitkBooleanOperatorLabelImageFilter.h index e7d1b73..523a179 100644 --- a/itk/clitkBooleanOperatorLabelImageFilter.h +++ b/itk/clitkBooleanOperatorLabelImageFilter.h @@ -99,8 +99,12 @@ namespace clitk { 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() {} diff --git a/itk/clitkCropLikeImageFilter.h b/itk/clitkCropLikeImageFilter.h index 47ae445..6e63608 100644 --- a/itk/clitkCropLikeImageFilter.h +++ b/itk/clitkCropLikeImageFilter.h @@ -71,7 +71,11 @@ namespace clitk { itkStaticConstMacro(ImageDimension, unsigned int, ImageType::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: CropLikeImageFilter(); diff --git a/itk/clitkLabelImageOverlapMeasureFilter.h b/itk/clitkLabelImageOverlapMeasureFilter.h index cf0645f..b2b79ac 100644 --- a/itk/clitkLabelImageOverlapMeasureFilter.h +++ b/itk/clitkLabelImageOverlapMeasureFilter.h @@ -93,7 +93,11 @@ namespace clitk { itkBooleanMacro(LongFlag); // I dont want to verify inputs information - virtual void VerifyInputInformation() { } +#if ITK_VERSION_MAJOR <= 4 + virtual void VerifyInputInformation() ITK_OVERRIDE { } +#else + virtual void VerifyInputInformation() const ITK_OVERRIDE { } +#endif protected: LabelImageOverlapMeasureFilter(); diff --git a/itk/clitkPasteImageFilter.h b/itk/clitkPasteImageFilter.h index 5f286b3..3429ab6 100644 --- a/itk/clitkPasteImageFilter.h +++ b/itk/clitkPasteImageFilter.h @@ -18,7 +18,11 @@ namespace clitk public itk::PasteImageFilter< TInputImage, TSourceImage, TOutputImage > { public: +#if ITK_VERSION_MAJOR <= 4 virtual void VerifyInputInformation() ITK_OVERRIDE { } +#else + virtual void VerifyInputInformation() const ITK_OVERRIDE { } +#endif /** Standard class typedefs. */ typedef PasteImageFilter Self; -- 2.45.0