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

diff --git a/tools/clitkCombineImageFilter.txx b/tools/clitkCombineImageFilter.txx
old mode 100755
new mode 100644
index 21eade3..206adac
--- a/tools/clitkCombineImageFilter.txx
+++ b/tools/clitkCombineImageFilter.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 clitkCombineImageFilter_txx
 #define 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);