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

[clitk.git] / itk / clitkComposeVFFilter.h

diff --git a/itk/clitkComposeVFFilter.h b/itk/clitkComposeVFFilter.h
old mode 100755 (executable)
new mode 100644 (file)
index d66d819..cf1ada2
--- a/itk/clitkComposeVFFilter.h
+++ b/itk/clitkComposeVFFilter.h
@@ -75,7 +75,11 @@ namespace clitk
 
     //========================================================================================
     //Threaded execution should implement generate threaded data
-    void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
+#if ITK_VERSION_MAJOR >= 4
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
+#else
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
+#endif
   
     bool m_Verbose;
     PixelType m_EdgePaddingValue;