comment momory display

[clitk.git] / tools / clitkCombineImageFilter.h

diff --git a/tools/clitkCombineImageFilter.h b/tools/clitkCombineImageFilter.h
old mode 100755 (executable)
new mode 100644 (file)
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