Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

[clitk.git] / tools / clitkCombineImageFilter.h

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