X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkShapedBLUTSpatioTemporalDeformableTransform.txx;h=7cc0107ec1a58facfdbe91ef6d72dfb9bbf641dd;hb=afd2671211668e6106886aa59c7bb13a82c48a94;hp=ea10c73d98757135a3408601e4d26f9fae9a2f05;hpb=e1098dccba022441144bfc1c44a2b58db7dde34e;p=clitk.git

diff --git a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx
index ea10c73..7cc0107 100644
--- a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx
+++ b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx
@@ -31,12 +31,7 @@ namespace clitk
 
   // Constructor with default arguments
   template<class TCoordRep, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-  ShapedBLUTSpatioTemporalDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>
-#if ITK_VERSION_MAJOR >= 4
-  ::ShapedBLUTSpatioTemporalDeformableTransform():Superclass(0)
-#else
-  ::ShapedBLUTSpatioTemporalDeformableTransform():Superclass(OutputDimension,0)
-#endif
+  ShapedBLUTSpatioTemporalDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>::ShapedBLUTSpatioTemporalDeformableTransform():Superclass(0)
   {
     unsigned int i;
     
@@ -383,11 +378,7 @@ namespace clitk
 
   // Get the number of parameters
   template<class TCoordRep, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-#if ITK_VERSION_MAJOR >= 4
   typename ShapedBLUTSpatioTemporalDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>::NumberOfParametersType
-#else
-  unsigned int
-#endif
   ShapedBLUTSpatioTemporalDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>
   ::GetNumberOfParameters(void) const
   {
@@ -810,19 +801,11 @@ namespace clitk
     //=====================================
     //JV Wrap jacobian into OutputDimension X Vectorial images
     //=====================================
-#if ITK_VERSION_MAJOR >= 4
     this->m_SharedDataBSplineJacobian.set_size( OutputDimension, this->GetNumberOfParameters() );
-#else
-    this->m_Jacobian.set_size( OutputDimension, this->GetNumberOfParameters() );
-#endif
 
     // Use memset to set the memory
     // JV four rows of three comps of parameters
-#if ITK_VERSION_MAJOR >= 4
     JacobianPixelType * jacobianDataPointer = reinterpret_cast<JacobianPixelType *>(this->m_SharedDataBSplineJacobian.data_block());
-#else
-    JacobianPixelType * jacobianDataPointer = reinterpret_cast<JacobianPixelType *>(this->m_Jacobian.data_block());
-#endif
     memset(jacobianDataPointer, 0,  OutputDimension*numberOfPixels*sizeof(JacobianPixelType));
 
     for (unsigned int j=0; j<OutputDimension; j++)
@@ -1058,7 +1041,6 @@ namespace clitk
     typename   CoefficientImageType::RegionType sourceRegion=m_PaddedCoefficientImage->GetLargestPossibleRegion();
     typename   CoefficientImageType::RegionType destinationRegion=m_PaddedCoefficientImage->GetLargestPossibleRegion();
     typename   CoefficientImageType::RegionType::SizeType sourceSize=sourceRegion.GetSize();
-    typename   CoefficientImageType::RegionType::SizeType destinationSize=destinationRegion.GetSize();    
     typename   CoefficientImageType::IndexType sourceIndex=sourceRegion.GetIndex();
     typename   CoefficientImageType::IndexType destinationIndex=destinationRegion.GetIndex();
  
@@ -2391,17 +2373,9 @@ namespace clitk
   // JV weights are identical as for transformpoint, could be done simultaneously in metric!!!!
   // Compute the Jacobian in one position 
   template<class TCoordRep, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-#if ITK_VERSION_MAJOR >= 4
   void
   ShapedBLUTSpatioTemporalDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>
   ::ComputeJacobianWithRespectToParameters( const InputPointType & point, JacobianType & jacobian) const
-#else
-  const 
-  typename ShapedBLUTSpatioTemporalDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>
-  ::JacobianType & 
-  ShapedBLUTSpatioTemporalDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>
-  ::GetJacobian( const InputPointType & point ) const
-#endif
   {
   
     //========================================================
@@ -2497,12 +2471,8 @@ namespace clitk
     if(m_Mask &&  !(m_Mask->IsInside(point) ) )
       {
 	// Outside: no (deformable) displacement
-#if ITK_VERSION_MAJOR >= 4
         jacobian = m_SharedDataBSplineJacobian;
         return;
-#else
-	return this->m_Jacobian;
-#endif
       }	
 
     // Get index   
@@ -2512,12 +2482,8 @@ namespace clitk
     // we assume zero displacement and return the input point
     if ( !this->InsideValidRegion( m_Index ) )
       {
-#if ITK_VERSION_MAJOR >= 4
         jacobian = m_SharedDataBSplineJacobian;
         return;
-#else
-	return this->m_Jacobian;
-#endif
       }
 
     // Compute interpolation weights
@@ -2685,11 +2651,7 @@ namespace clitk
       }
 
     // Return the result
-#if ITK_VERSION_MAJOR >= 4
     jacobian = m_SharedDataBSplineJacobian;
-#else
-    return this->m_Jacobian;
-#endif
   }