X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkMatrixTransformToVFGenericFilter.txx;h=8bc8877cf9757239091cf126382cdfcc2a99397a;hb=a1ec529a24b721fcfb2c5725f95bcc2c9125b28d;hp=ebc0e45c3ba6ba0beaf9d30dd05b5a954444ebad;hpb=47ac2413c129f2e330a760b665f03e6032aa46fb;p=clitk.git

diff --git a/registration/clitkMatrixTransformToVFGenericFilter.txx b/registration/clitkMatrixTransformToVFGenericFilter.txx
index ebc0e45..8bc8877 100644
--- a/registration/clitkMatrixTransformToVFGenericFilter.txx
+++ b/registration/clitkMatrixTransformToVFGenericFilter.txx
@@ -78,11 +78,12 @@ namespace clitk
     typedef itk::Image<Displacement, Dimension> OutputImageType;
     
     // Filter
-#if ITK_VERSION_MAJOR >= 4
+#if (ITK_VERSION_MAJOR == 4) && (ITK_VERSION_MINOR < 6)
     typedef itk::TransformToDisplacementFieldSource<OutputImageType, double> ConvertorType;
 #else
-    typedef itk::TransformToDeformationFieldSource<OutputImageType, double> ConvertorType;
+    typedef itk::TransformToDisplacementFieldFilter<OutputImageType, double> ConvertorType;
 #endif
+
     typename   ConvertorType::Pointer filter= ConvertorType::New();
 
     // Output image info
@@ -94,7 +95,12 @@ namespace clitk
 	reader2->Update();
 
 	typename OutputImageType::Pointer image=reader2->GetOutput();
-	filter->SetOutputParametersFromImage(image);
+#if ITK_VERSION_MAJOR > 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR >= 6)
+    filter->SetReferenceImage(image);
+    filter->UseReferenceImageOn();
+#else
+    filter->SetOutputParametersFromImage(image);
+#endif
       }
     else
       {
@@ -118,8 +124,12 @@ namespace clitk
 	    typename OutputImageType::SizeType size;
 	    for(i=0;i<Dimension;i++)
 	      size[i]=m_ArgsInfo.size_arg[i];
-	    filter->SetOutputSize(size);
-	  }
+#if ITK_VERSION_MAJOR > 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR >= 6)
+        filter->SetSize(size);
+#else
+        filter->SetOutputSize(size);
+#endif
+      }
       }
     
     // Transform