Merge branch 'master' of tux.creatis.insa-lyon.fr:clitk

[clitk.git] / itk / clitkReconstructThroughDilationImageFilter.h

diff --git a/itk/clitkReconstructThroughDilationImageFilter.h b/itk/clitkReconstructThroughDilationImageFilter.h
index c464c08ea50b4b827dc3ef1a828c3e8cf0e2a133..de4d5abd636025ac777485e1748deacdb5755d3a 100644 (file)
--- a/itk/clitkReconstructThroughDilationImageFilter.h
+++ b/itk/clitkReconstructThroughDilationImageFilter.h
@@ -39,7 +39,11 @@
 #include "itkConnectedComponentImageFilter.h"
 #include "itkStatisticsImageFilter.h"
 #include "itkCastImageFilter.h"
-#include "itkDifferenceImageFilter.h"
+#if ITK_VERSION_MAJOR >= 4
+  #include "itkTestingComparisonImageFilter.h"
+#else
+  #include "itkDifferenceImageFilter.h"
+#endif
 #include "itkThresholdImageFilter.h"
 
 namespace clitk 
@@ -84,6 +88,7 @@ namespace clitk
     itkSetMacro( Verbose, bool);
     itkGetConstReferenceMacro( Verbose, bool);
     void SetRadius ( const SizeType& s){ m_Radius=s; this->Modified();}
+    void SetRadius(const int r) { for(uint i=0; i<InputImageDimension; i++) m_Radius[i] = r; SetRadius(m_Radius); }
     SizeType GetRadius(void){return m_Radius;}
     itkSetMacro( ErosionPaddingValue, OutputPixelType);
     itkGetConstMacro( ErosionPaddingValue, OutputPixelType)
@@ -110,7 +115,7 @@ namespace clitk
 
     //     // Threaded Generate Data
     //     void BeforeThreadedGenerateData(void );
-    //     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, int threadId );
+    //     void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId );
     //     void AfterThreadedGenerateData(void );
     //     // Override defaults
     //     virtual void GenerateInputRequestedRegion();