X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FRelativePositionPropImageFilter.h;h=e876f9fd6e042ba29a134f1f9cb709fdbe09f891;hb=f05cc2cf37d7ec960b73fa9d2393d5a888e1f87a;hp=183f260e0bee422f9a632a668f42fc6c91317274;hpb=aa66e8e3252e2d42c7a1fd8b21336a5a0a65835d;p=clitk.git diff --git a/itk/RelativePositionPropImageFilter.h b/itk/RelativePositionPropImageFilter.h index 183f260..e876f9f 100644 --- a/itk/RelativePositionPropImageFilter.h +++ b/itk/RelativePositionPropImageFilter.h @@ -169,9 +169,12 @@ namespace itk } } - - virtual void GenerateInputRequestedRegion() throw(InvalidRequestedRegionError); - void EnlargeOutputRequestedRegion (DataObject * output); +#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 )) + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; +#else + virtual void GenerateInputRequestedRegion() throw(InvalidRequestedRegionError) ITK_OVERRIDE; +#endif + void EnlargeOutputRequestedRegion (DataObject * output) ITK_OVERRIDE; protected: RelativePositionPropImageFilter() @@ -185,10 +188,10 @@ namespace itk m_VerboseProgress = false; } virtual ~RelativePositionPropImageFilter() {} - void PrintSelf(std::ostream& os, Indent indent) const; + void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE; //void GenerateThreadedData(const typename TOutputImage::RegionType& outputRegionForThread, int threadId); - void GenerateData(); + void GenerateData() ITK_OVERRIDE; private: RelativePositionPropImageFilter(const Self&); //purposely not implemented