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

diff --git a/itk/clitkComposeVFFilter.txx b/itk/clitkComposeVFFilter.txx
index e70d9c3..e42c852 100644
--- a/itk/clitkComposeVFFilter.txx
+++ b/itk/clitkComposeVFFilter.txx
@@ -36,7 +36,7 @@ namespace clitk
   //=========================================================================================================================
   //update the output for the outputRegionForThread
   template<class InputImageType, class OutputImageType> 
-  void ComposeVFFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
+  void ComposeVFFilter<InputImageType, OutputImageType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId )
   {
  
     //Get pointer to the output
@@ -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;