X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FitkFlexibleBinaryFunctorImageFilter.h;h=f8736d7e1cf04e43c3002c4dc86789378544c24a;hb=ae51e9bb80bdcd9468718a9473c1e9316cef2fd5;hp=c51ab0ce652d31c1d8be969af6449789f7c8303c;hpb=a0b469cb6663824df2afd555fc901c52f77235c4;p=clitk.git diff --git a/itk/itkFlexibleBinaryFunctorImageFilter.h b/itk/itkFlexibleBinaryFunctorImageFilter.h index c51ab0c..f8736d7 100644 --- a/itk/itkFlexibleBinaryFunctorImageFilter.h +++ b/itk/itkFlexibleBinaryFunctorImageFilter.h @@ -20,6 +20,8 @@ #include "itkInPlaceImageFilter.h" #include "itkImageRegionIteratorWithIndex.h" +#include "clitkCommon.h" + namespace itk { @@ -109,8 +111,8 @@ public: } } - virtual void GenerateOutputInformation(); - virtual void GenerateInputRequestedRegion(); + virtual void GenerateOutputInformation() ITK_OVERRIDE; + virtual void GenerateInputRequestedRegion() ITK_OVERRIDE; /** ImageDimension constants */ itkStaticConstMacro( @@ -146,7 +148,7 @@ protected: * \sa ImageToImageFilter::ThreadedGenerateData(), * ImageToImageFilter::GenerateData() */ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, - int threadId ); + itk::ThreadIdType threadId ) ITK_OVERRIDE; private: FlexibleBinaryFunctorImageFilter(const Self&); //purposely not implemented