X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkCombineImageFilter.h;h=c48b1d188fbf0aaf20ec15b796f9d70f7bc203b2;hb=c2918f7b7d7ee8f15d9490df55d7b971b3210da1;hp=9cba3a8d75e7d2cd3e3f657ca278ff39fc78a331;hpb=a26cd8a19e1b9ad8344ab501436045f171a73713;p=clitk.git

diff --git a/tools/clitkCombineImageFilter.h b/tools/clitkCombineImageFilter.h
old mode 100755
new mode 100644
index 9cba3a8..c48b1d1
--- a/tools/clitkCombineImageFilter.h
+++ b/tools/clitkCombineImageFilter.h
@@ -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_h
 #define clitkCombineImageFilter_h
 
@@ -90,7 +90,7 @@ namespace clitk
     // Update
     //----------------------------------------  
     // Generate Data
-    void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId);
+    void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, itk::ThreadIdType threadId);
 
     //----------------------------------------  
     // Data members