CMake updated. Some other filters added.

[FrontAlgorithms.git] / lib / fpa / Image / Functors / RegionGrowThresholdFunction.h

diff --git a/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h b/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h
index 739dff4c24beb40c6d76c94e3977bef3d02bc588..3d7d5ac8b167ff413ead2f2ac13d18b6057d1e4c 100644 (file)
--- a/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h
+++ b/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h
@@ -24,10 +24,9 @@ namespace fpa
         typedef itk::SmartPointer< const Self >   ConstPointer;
 
         // Superclass' types
-        typedef typename Superclass::TInputImage  TInputImage;
-        typedef typename Superclass::TOutputValue TOutputValue;
-        typedef typename Superclass::TIndex       TIndex;
-        typedef typename I::PixelType             TPixel;
+        typedef I                     TInputImage;
+        typedef typename I::IndexType TIndex;
+        typedef typename I::PixelType TPixel;
 
       public:
         itkNewMacro( Self );
@@ -43,14 +42,14 @@ namespace fpa
         itkSetMacro( UpperThreshold, TPixel );
 
       public:
-        virtual TOutputValue Evaluate( const TIndex& idx ) const
+        virtual bool Evaluate( const TIndex& idx ) const
           {
-            const I* img = this->GetInputImage( );
+            const I* img = this->GetSpace( );
             if( img != NULL )
             {
               TPixel v = img->GetPixel( idx );
               return(
-                this->m_LowerThreshold <= v && v < this->m_UpperThreshold
+                !( v < this->m_LowerThreshold || this->m_UpperThreshold < v )
                 );
 
             } // fi