From f0adfdc4ba7f1cab53381fa4b6e75aaf63ab7744 Mon Sep 17 00:00:00 2001 From: Romulo Pinho Date: Tue, 21 Feb 2012 15:13:19 +0100 Subject: [PATCH] itk4 compatibility --- itk/itkFlexibleBinaryFunctorImageFilter.h | 5 +++++ itk/itkFlexibleBinaryFunctorImageFilter.txx | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/itk/itkFlexibleBinaryFunctorImageFilter.h b/itk/itkFlexibleBinaryFunctorImageFilter.h index c51ab0c..18062a2 100644 --- a/itk/itkFlexibleBinaryFunctorImageFilter.h +++ b/itk/itkFlexibleBinaryFunctorImageFilter.h @@ -145,8 +145,13 @@ protected: * * \sa ImageToImageFilter::ThreadedGenerateData(), * ImageToImageFilter::GenerateData() */ +#if ITK_VERSION_MAJOR >= 4 + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, + itk::ThreadIdType threadId ); +#else void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId ); +#endif private: FlexibleBinaryFunctorImageFilter(const Self&); //purposely not implemented diff --git a/itk/itkFlexibleBinaryFunctorImageFilter.txx b/itk/itkFlexibleBinaryFunctorImageFilter.txx index 0914787..f8c7a75 100644 --- a/itk/itkFlexibleBinaryFunctorImageFilter.txx +++ b/itk/itkFlexibleBinaryFunctorImageFilter.txx @@ -98,7 +98,11 @@ template ::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, +#if ITK_VERSION_MAJOR >= 4 + itk::ThreadIdType threadId ) +#else int threadId) +#endif { const unsigned int dim = Input1ImageType::ImageDimension; -- 2.47.1