X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkBLUTDIRGenericFilter.h;h=eda242f5b4d7d843a91cb2809dbbe319536d06db;hb=5a7da4aedae5c204bc55c187717193e5950f9a44;hp=c0f9003f51111f119c0947f30ba0ac6e25b4d842;hpb=539c27b2c26058b3264b15f0176a535ac2f8152d;p=clitk.git

diff --git a/registration/clitkBLUTDIRGenericFilter.h b/registration/clitkBLUTDIRGenericFilter.h
old mode 100755
new mode 100644
index c0f9003..eda242f
--- a/registration/clitkBLUTDIRGenericFilter.h
+++ b/registration/clitkBLUTDIRGenericFilter.h
@@ -1,9 +1,9 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  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,17 +14,17 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef clitkBLUTDIRGenericFilter_h
 #define clitkBLUTDIRGenericFilter_h
 
 /* =================================================
  * @file   clitkBLUTDIRGenericFilter.h
- * @author 
- * @date   
- * 
- * @brief 
- * 
+ * @author
+ * @date
+ *
+ * @brief
+ *
  ===================================================*/
 
 
@@ -35,11 +35,11 @@
 #include "clitkDifferenceImageFilter.h"
 #include "clitkTransformUtilities.h"
 #include "clitkLBFGSBOptimizer.h"
-#include "clitkBSplineDeformableTransform.h"
+#include "clitkMultipleBSplineDeformableTransform.h"
 #include "clitkGenericOptimizer.h"
 #include "clitkGenericInterpolator.h"
 #include "clitkGenericMetric.h"
-#include "clitkBSplineDeformableTransformInitializer.h"
+#include "clitkMultipleBSplineDeformableTransformInitializer.h"
 #include "clitkMultiResolutionPyramidRegionFilter.h"
 #include "clitkImageToImageGenericFilter.h"
 
@@ -57,15 +57,18 @@
 #include "itkLightObject.h"
 #include "itkImageToImageMetric.h"
 #include "itkInterpolateImageFunction.h"
-#include "itkLabelStatisticsImageFilter.h"
+#include "itkLabelGeometryImageFilter.h"
 #include "itkImageDuplicator.h"
 #include "itkExtractImageFilter.h"
-#include "itkTransformToDeformationFieldSource.h"
+#if ITK_VERSION_MAJOR >= 4
+  #include "itkTransformToDisplacementFieldSource.h"
+#else
+  #include "itkTransformToDeformationFieldSource.h"
+#endif
 
-namespace clitk 
+namespace clitk
 {
 
-
   class ITK_EXPORT BLUTDIRGenericFilter :public ImageToImageGenericFilter<BLUTDIRGenericFilter>
   {
   public:
@@ -76,14 +79,14 @@ namespace clitk
     typedef itk::SmartPointer<Self>            Pointer;
     typedef itk::SmartPointer<const Self>      ConstPointer;
     typedef ImageToImageGenericFilterBase   Superclass;
-   
+
     // Method for creation through the object factory
-    itkNewMacro(Self);  
-    
+    itkNewMacro(Self);
+
     void SetArgsInfo(const args_info_clitkBLUTDIR & a);
 
     // Run-time type information (and related methods)
-    
+
     template<unsigned int Dim>
     void InitializeImageType();
 
@@ -97,7 +100,6 @@ namespace clitk
 
   };
 
-
 } // end namespace clitk