X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkCombineImageFilter.txx;h=206adac7ad7a7cb65befa6f6866b4076b540f9d6;hb=db115de89af274d19472eec04ee49e100fdfd4fa;hp=8a4f0514e39a9ac82b8ddcaa5de6d12f9ce72add;hpb=765020625fbc092d283e221e36c83e60a1844cb7;p=clitk.git

diff --git a/tools/clitkCombineImageFilter.txx b/tools/clitkCombineImageFilter.txx
old mode 100755
new mode 100644
index 8a4f051..206adac
--- a/tools/clitkCombineImageFilter.txx
+++ b/tools/clitkCombineImageFilter.txx
@@ -46,7 +46,7 @@ namespace clitk
   //-------------------------------------------------------------------
   template<class InputImageType> 
   void 
-  CombineImageFilter<InputImageType>::ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId)
+  CombineImageFilter<InputImageType>::ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadId)
   {
     typename InputImageType::ConstPointer input1=this->GetInput(0);
     typename InputImageType::ConstPointer input2=this->GetInput(1);