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

diff --git a/itk/clitkComposeVFFilter.txx b/itk/clitkComposeVFFilter.txx
index f0bf5a9..a50ca26 100644
--- a/itk/clitkComposeVFFilter.txx
+++ b/itk/clitkComposeVFFilter.txx
@@ -35,8 +35,13 @@ 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
@@ -116,6 +121,7 @@ namespace clitk
 		
 		
 		// get neighbor index and overlap fraction
+                bool neighbIndexSupZero = 1;
 		for( dim = 0; dim < ImageDimension; dim++ )
 		  {
 		    if ( upper & 1 )
@@ -128,12 +134,14 @@ namespace clitk
 			neighIndex[dim] = baseIndex[dim];
 			overlap *= 1.0 - distance[dim];
 		      }
+                    if (neighIndex[dim] < 0)
+                      neighbIndexSupZero = 0;
 		    upper >>= 1;
 		  }
 
 		//JV shouldn't we verify that the index is not over the upper border instead of zero?
 		// Set neighbor value only if overlap is not zero and index is still in image
-		if( overlap>0.0 && neighIndex[0]>=0 && neighIndex[1]>=0 && neighIndex[2]>=0 )
+		if ( overlap>0.0 && neighbIndexSupZero )
 		  {
 		    //what to store? the weighted displacement vector of Input2? 
 		    totalDisplacement+=m_Input2->GetPixel(neighIndex)*overlap;