X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkInvertVFFilter.h;h=b3167450dd810d2fe6b30b13dea74cdfc50cdec1;hb=a523f5be1e221995c0d4d29a0077b5e8b984c96d;hp=039dc9197aefac257dae7ae434c83f3614176cde;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git

diff --git a/itk/clitkInvertVFFilter.h b/itk/clitkInvertVFFilter.h
index 039dc91..b316745 100644
--- a/itk/clitkInvertVFFilter.h
+++ b/itk/clitkInvertVFFilter.h
@@ -1,8 +1,23 @@
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.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
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
+
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
 #ifndef __clitkInvertVFFilter_h
 #define __clitkInvertVFFilter_h
-
-//clitk include
-#include "clitkIOCommon.h"
+#include "clitkImageCommon.h"
 
 #include "itkImageToImageFilter.h"
 #include "itkImage.h"
@@ -36,7 +51,9 @@ namespace clitk
     //Some other typedefs
     typedef double CoordRepType;
     typedef itk::Image<double, ImageDimension> WeightsImageType;
+#if ITK_VERSION_MAJOR <= 4
     typedef itk::Image<itk::SimpleFastMutexLock, ImageDimension> MutexImageType;
+#endif
 
     /** Point type */
     typedef itk::Point<CoordRepType,itkGetStaticConstMacro(ImageDimension)> PointType;
@@ -50,22 +67,38 @@ namespace clitk
     //Set Methods(inline)
     itkSetMacro( Verbose, bool);
     itkSetMacro( EdgePaddingValue, PixelType );
-    void SetNumberOfThreads(unsigned int r )
+#if ITK_VERSION_MAJOR <= 4
+    void SetNumberOfThreads(unsigned int r ) ITK_OVERRIDE
+#else
+    void SetNumberOfWorkUnits(unsigned int r ) ITK_OVERRIDE
+#endif
     {
       m_NumberOfThreadsIsGiven=true;
+#if ITK_VERSION_MAJOR <= 4
       m_NumberOfThreads=r;
+#else
+      m_NumberOfWorkUnits=r;
+#endif
     }
     itkSetMacro(ThreadSafe, bool);
+    itkSetMacro(OutputSpacing, SpacingType);
+    itkSetMacro(OutputSize, SizeType);
 
   
   protected:
     InvertVFFilter();
     ~InvertVFFilter() {};
-    void GenerateData( );
-   
+    void GenerateData( ) ITK_OVERRIDE;
+    
     bool m_Verbose;
     bool m_NumberOfThreadsIsGiven;
+    SpacingType m_OutputSpacing;
+    SizeType m_OutputSize;
+#if ITK_VERSION_MAJOR <= 4
     unsigned int m_NumberOfThreads;
+#else
+    unsigned int m_NumberOfWorkUnits;
+#endif
     PixelType m_EdgePaddingValue;
     bool m_ThreadSafe;
   };