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

diff --git a/itk/clitkComposeVFFilter.txx b/itk/clitkComposeVFFilter.txx
index f0bf5a9..e42c852 100644
--- a/itk/clitkComposeVFFilter.txx
+++ b/itk/clitkComposeVFFilter.txx
@@ -98,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] );
@@ -116,6 +116,7 @@ namespace clitk
 		
 		
 		// get neighbor index and overlap fraction
+                bool neighbIndexSupZero = 1;
 		for( dim = 0; dim < ImageDimension; dim++ )
 		  {
 		    if ( upper & 1 )
@@ -128,12 +129,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;