X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkShapedBLUTSpatioTemporalDeformableTransform.h;h=c9fb588e30f83641260459a16e9d57e0cd684a66;hb=e3dfdd2305abb337638468aaca3d9b20718b5026;hp=81173be3393e2727a44f65c63d671cfd0eeef1b2;hpb=765020625fbc092d283e221e36c83e60a1844cb7;p=clitk.git

diff --git a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
old mode 100755
new mode 100644
index 81173be..c9fb588
--- a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
+++ b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
@@ -27,7 +27,6 @@
 #include "itkImageRegion.h"
 #include "itkSpatialObject.h"
 #include "itkPasteImageFilter.h"
-#include "itkMultiplyByConstantImageFilter.h"
 
 namespace clitk
 {
@@ -69,6 +68,9 @@ namespace clitk
 
     /** Standard parameters container. */
     typedef typename Superclass::ParametersType ParametersType;
+#if ITK_VERSION_MAJOR >= 4
+    typedef typename Superclass::NumberOfParametersType NumberOfParametersType;
+#endif
 
     /** Standard Jacobian container. */
     typedef typename Superclass::JacobianType JacobianType;
@@ -264,10 +266,22 @@ namespace clitk
     } 
     
     /** Compute the Jacobian Matrix of the transformation at one point */
+#if ITK_VERSION_MAJOR >= 4
+    virtual void ComputeJacobianWithRespectToParameters (const InputPointType &p, JacobianType &jacobian) const;
+    virtual void ComputeJacobianWithRespectToPosition (const InputPointType &p, JacobianType &jacobian) const
+    {
+      itkExceptionMacro( "ComputeJacobianWithRespectToPosition not yet implemented for " << this->GetNameOfClass() );
+    }
+#else
     virtual const JacobianType& GetJacobian(const InputPointType  &point ) const;
+#endif
 
     /** Return the number of parameters that completely define the Transfom */
+#if ITK_VERSION_MAJOR >= 4
+    virtual NumberOfParametersType GetNumberOfParameters(void) const;
+#else
     virtual unsigned int GetNumberOfParameters(void) const;
+#endif
 
     //JV Return the padded number of parameters
     virtual unsigned int GetPaddedNumberOfParameters(void) const;
@@ -431,6 +445,9 @@ namespace clitk
     // JV Shape
     unsigned int m_TransformShape;
 
+#if ITK_VERSION_MAJOR >= 4
+    mutable JacobianType                            m_SharedDataBSplineJacobian;
+#endif
 
   }; //class ShapedBLUTSpatioTemporalDeformableTransform