X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkComposeVFFilter.txx;h=e42c8520e66392f5619162be817b2f6b32b5f03e;hb=d98418e7948315cd8c6ae9a2d5452ef0b52f9827;hp=a50ca26a38ee2556751e7af18c7a8913e852546a;hpb=c1f8a7a05902373f2b20600b541352172705e176;p=clitk.git

diff --git a/itk/clitkComposeVFFilter.txx b/itk/clitkComposeVFFilter.txx
index a50ca26..e42c852 100644
--- a/itk/clitkComposeVFFilter.txx
+++ b/itk/clitkComposeVFFilter.txx
@@ -35,13 +35,8 @@ namespace clitk
 
   //=========================================================================================================================
   //update the output for the outputRegionForThread
-#if ITK_VERSION_MAJOR >= 4
   template<class InputImageType, class OutputImageType> 
   void ComposeVFFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
-#else
-  template<class InputImageType, class OutputImageType> 
-  void ComposeVFFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
-#endif
   {
  
     //Get pointer to the output
@@ -103,7 +98,7 @@ namespace clitk
 	      {
 		// The following  block is equivalent to the following line without
 		// having to call floor. (Only for positive inputs, we already now that is in the image)
-		// baseIndex[dim] = (long) vcl_floor(contIndex[dim] );
+		// baseIndex[dim] = (long) std::floor(contIndex[dim] );
 	
 		baseIndex[dim] = (long) contIndex[dim];
 		distance[dim] = contIndex[dim] - double( baseIndex[dim] );