...

[FrontAlgorithms.git] / lib / fpa / Image / Algorithm.h

diff --git a/lib/fpa/Image/Algorithm.h b/lib/fpa/Image/Algorithm.h
index 70a87a611543fe78b7d3076a44df96eba271355a..0105cc3080d13166c0a23ca5b702b7622012c795 100644 (file)
--- a/lib/fpa/Image/Algorithm.h
+++ b/lib/fpa/Image/Algorithm.h
@@ -28,7 +28,9 @@ namespace fpa
 
       typedef typename Superclass::TFrontId      TFrontId;
       typedef typename Superclass::TNeighborhood TNeighborhood;
-      typedef fpa::Image::Functors::Base< itk::ImageBase< _TInputImage::ImageDimension >, itk::FunctionBase< TVertex, TNeighborhood > > TNeighborhoodFunction;
+
+      typedef fpa::Image::Functors::Base< itk::ImageBase< _TInputImage::ImageDimension >, typename Superclass::TNeighborhoodFunction > TNeighborhoodFunction;
+      typedef fpa::Image::Functors::Base< _TInputImage, typename Superclass::TVertexFunction > TVertexFunction;
 
     protected:
       typedef typename Superclass::_TQueueNode _TQueueNode;
@@ -40,13 +42,15 @@ namespace fpa
       Algorithm( );
       virtual ~Algorithm( );
 
-      virtual void _BeforeGenerateData( ) fpa_OVERRIDE;
-      virtual void _InitMarks( ) fpa_OVERRIDE;
-      virtual void _InitResults( const TOutput& init_value ) fpa_OVERRIDE;
-      virtual bool _IsMarked( const TVertex& v ) const fpa_OVERRIDE;
-      virtual void _Mark( const _TQueueNode& n ) fpa_OVERRIDE;
-      virtual TFrontId _GetMark( const TVertex& v ) const fpa_OVERRIDE;
-      virtual void _UpdateResult( const _TQueueNode& n ) fpa_OVERRIDE;
+      virtual void _BeforeGenerateData( ) override;
+      virtual void _InitMarks( ) override;
+      virtual void _InitResults( const TOutput& init_value ) override;
+      virtual bool _IsMarked( const TVertex& v ) const override;
+      virtual void _Mark( const _TQueueNode& n ) override;
+      virtual TFrontId _GetMark( const TVertex& v ) const override;
+      virtual void _UpdateResult( const _TQueueNode& n ) override;
+      virtual TOutput _GetResult( const TVertex& v ) const override;
+      virtual unsigned int _GetNumberOfDimensions( ) const override;
 
     private:
       // Purposely not defined