X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpExtensions%2FAlgorithms%2FIsoImageSlicer.h;h=dad9c7a485b9ca6ba5414852fb80b3f6cea59f70;hb=8eaa2cf759c39233848cdd5b8346faccbea4c172;hp=2582cf9f6400859366a4326c6e2d95bdcf522f68;hpb=506b27e2ea07cb34ba230b02eb6857b20cbf78b1;p=cpPlugins.git

diff --git a/lib/cpExtensions/Algorithms/IsoImageSlicer.h b/lib/cpExtensions/Algorithms/IsoImageSlicer.h
index 2582cf9..dad9c7a 100644
--- a/lib/cpExtensions/Algorithms/IsoImageSlicer.h
+++ b/lib/cpExtensions/Algorithms/IsoImageSlicer.h
@@ -5,6 +5,7 @@
 #ifndef __CPEXTENSIONS__ALGORITHMS__ISOIMAGESLICER__H__
 #define __CPEXTENSIONS__ALGORITHMS__ISOIMAGESLICER__H__
 
+#include <cpExtensions/Config.h>
 #include <itkAffineTransform.h>
 #include <itkExtractImageFilter.h>
 #include <itkImage.h>
@@ -86,7 +87,7 @@ namespace cpExtensions
       itkSetMacro( SpacingFromMinimum, bool );
 
     public:
-      virtual unsigned long GetMTime( ) const;
+      virtual unsigned long GetMTime( ) const cpExtensions_OVERRIDE;
 
       const TInterpolateFunction* GetInterpolator( ) const;
       const TMatrix& GetRotation( ) const;
@@ -105,9 +106,9 @@ namespace cpExtensions
       BaseImageSlicer( );
       virtual ~BaseImageSlicer( );
 
-      virtual void GenerateOutputInformation( ); // TODO { }
-      virtual void GenerateInputRequestedRegion( );
-      virtual void GenerateData( );
+      virtual void GenerateOutputInformation( ) cpExtensions_OVERRIDE; // TODO { }
+      virtual void GenerateInputRequestedRegion( ) cpExtensions_OVERRIDE;
+      virtual void GenerateData( ) cpExtensions_OVERRIDE;
 
     private:
       // Purposely not implemented
@@ -134,8 +135,6 @@ namespace cpExtensions
 
 } // ecapseman
 
-} // ecapseman
-
 // -------------------------------------------------------------------------
 #define CPPLUGINS_DEFINE_ISOIMAGESLICER( name, R, F )                   \
   template< class I, class S = double >                                 \
@@ -158,28 +157,28 @@ namespace cpExtensions
     void operator=( const Self& );                                      \
   };
 
-namespace cpPlugins
+namespace cpExtensions
 {
-  namespace Extensions
+  namespace Algorithms
   {
-    namespace Algorithms
-    {
-      CPPLUGINS_DEFINE_ISOIMAGESLICER(
-        IsoImageSlicer,
-        itk::ResampleImageFilter,
-        itk::InterpolateImageFunction
-        );
-      CPPLUGINS_DEFINE_ISOIMAGESLICER(
-        VectorIsoImageSlicer,
-        itk::VectorResampleImageFilter,
-        itk::VectorInterpolateImageFunction
-        );
-
-    } // ecapseman
+    CPPLUGINS_DEFINE_ISOIMAGESLICER(
+      IsoImageSlicer,
+      itk::ResampleImageFilter,
+      itk::InterpolateImageFunction
+      );
+    CPPLUGINS_DEFINE_ISOIMAGESLICER(
+      VectorIsoImageSlicer,
+      itk::VectorResampleImageFilter,
+      itk::VectorInterpolateImageFunction
+      );
 
   } // ecapseman
 
+} // ecapseman
+
+#ifndef ITK_MANUAL_INSTANTIATION
 #include <cpExtensions/Algorithms/IsoImageSlicer.hxx>
+#endif // ITK_MANUAL_INSTANTIATION
 
 #endif // __CPEXTENSIONS__ALGORITHMS__ISOIMAGESLICER__H__