Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / registration / clitkConvertBSplineDeformableTransformToVFGenericFilter.cxx

diff --git a/registration/clitkConvertBSplineDeformableTransformToVFGenericFilter.cxx b/registration/clitkConvertBSplineDeformableTransformToVFGenericFilter.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 0d3929a..169de13
--- a/registration/clitkConvertBSplineDeformableTransformToVFGenericFilter.cxx
+++ b/registration/clitkConvertBSplineDeformableTransformToVFGenericFilter.cxx
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef clitkConvertBSplineDeformableTransformToVFGenericFilter_cxx
 #define clitkConvertBSplineDeformableTransformToVFGenericFilter_cxx
 
@@ -80,7 +80,11 @@ namespace clitk
     // -----------------------------------------------
     // Filter
     // -----------------------------------------------
+#if ITK_VERSION_MAJOR >= 4
+    typedef itk::TransformToDisplacementFieldSource<OutputImageType, double> ConvertorType;
+#else
     typedef itk::TransformToDeformationFieldSource<OutputImageType, double> ConvertorType;
+#endif
     ConvertorType::Pointer filter= ConvertorType::New();
 
     //Output image info