X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkComposeVFFilter.h;h=cf1ada2c77678ea0336d8f0662bd6fceec5ad88e;hb=4cfd18a5e026b6b20a4dfbdd32606b0fc18883b5;hp=d66d819b0c750b4a82447bd52877d09ce690030e;hpb=573d80d0f7a17607d2ee883c21c940c0ba020282;p=clitk.git diff --git a/itk/clitkComposeVFFilter.h b/itk/clitkComposeVFFilter.h old mode 100755 new mode 100644 index d66d819..cf1ada2 --- a/itk/clitkComposeVFFilter.h +++ b/itk/clitkComposeVFFilter.h @@ -75,7 +75,11 @@ namespace clitk //======================================================================================== //Threaded execution should implement generate threaded data - void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId ); +#if ITK_VERSION_MAJOR >= 4 + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ); +#else + void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId ); +#endif bool m_Verbose; PixelType m_EdgePaddingValue;