X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkInvertVFFilter.txx;h=b74958fb597a83dc9b3f559936973b340ee6874d;hb=401388055a9276c211c06f7f82ea5a0869ca3728;hp=684b35545add887b43a3827a6efd9ce8d71577d0;hpb=42f68068ef3488c8ca2d921b6835d34fe6494d5f;p=clitk.git diff --git a/itk/clitkInvertVFFilter.txx b/itk/clitkInvertVFFilter.txx index 684b355..b74958f 100644 --- a/itk/clitkInvertVFFilter.txx +++ b/itk/clitkInvertVFFilter.txx @@ -75,7 +75,11 @@ protected: //the actual processing void BeforeThreadedGenerateData(); +#if ITK_VERSION_MAJOR >= 4 + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ); +#else void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId ); +#endif //member data typename WeightsImageType::Pointer m_Weights; @@ -113,7 +117,11 @@ void HelperClass1::BeforeThreadedGenerateData() //========================================================================================================================= //update the output for the outputRegionForThread template +#if ITK_VERSION_MAJOR >= 4 +void HelperClass1::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ) +#else void HelperClass1::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId ) +#endif { //std::cout << "HelperClass1::ThreadedGenerateData - IN" << std::endl; //Get pointer to the input @@ -285,8 +293,11 @@ protected: //the actual processing +#if ITK_VERSION_MAJOR >= 4 + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ); +#else void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId ); - +#endif //member data typename WeightsImageType::Pointer m_Weights; @@ -311,7 +322,11 @@ template HelperClass2= 4 +template void HelperClass2::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ) +#else template void HelperClass2::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId ) +#endif { //std::cout << "HelperClass2::ThreadedGenerateData - IN" << std::endl;