X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FclitkInvertVFFilter.h;h=b3167450dd810d2fe6b30b13dea74cdfc50cdec1;hb=1c6241402b25efea0052f0464be9a494e761b19e;hp=586d872fd619ce4351ace1dbe4979fd760d42d41;hpb=2252420857d1554424d1f2c69ea68547bc759678;p=clitk.git

diff --git a/itk/clitkInvertVFFilter.h b/itk/clitkInvertVFFilter.h
index 586d872..b316745 100644
--- a/itk/clitkInvertVFFilter.h
+++ b/itk/clitkInvertVFFilter.h
@@ -51,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;
@@ -65,10 +67,18 @@ 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);
@@ -78,15 +88,17 @@ namespace clitk
   protected:
     InvertVFFilter();
     ~InvertVFFilter() {};
-    void GenerateData( );
-    void GenerateOutputInformation();
-    void GenerateInputRequestedRegion();
+    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;
   };