X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkExtractImageFilter.txx;h=90fee3bbd49f312a120373da966ae0bbc845b5cf;hb=3d4b1e6cb67393a306cd670ce0527c4f96b13f4b;hp=d88ecc6ffb68fe7fa46b36c240d4e65822d60e4a;hpb=a26cd8a19e1b9ad8344ab501436045f171a73713;p=clitk.git diff --git a/itk/clitkExtractImageFilter.txx b/itk/clitkExtractImageFilter.txx index d88ecc6..90fee3b 100644 --- a/itk/clitkExtractImageFilter.txx +++ b/itk/clitkExtractImageFilter.txx @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,7 +14,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ +===========================================================================**/ #ifndef _clitkExtractImageFilter_txx #define _clitkExtractImageFilter_txx @@ -236,8 +236,11 @@ ExtractImageFilter template void ExtractImageFilter -::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, - int threadId) +#if ITK_VERSION_MAJOR >= 4 +::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) +#else +::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId) +#endif { itkDebugMacro(<<"Actually executing");