X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FRelativePositionPropImageFilter.h;h=c2391e7b538a16cbf06ba0ad0eddfe77d0b0a56c;hb=49169efa175f39cb8052cea08186c032835bb2f2;hp=11797e78d72ed449edddafc67d1873f7b2a1a3d1;hpb=08d1fd56ac1d08bd228d9e557f5472a395e9b708;p=clitk.git

diff --git a/itk/RelativePositionPropImageFilter.h b/itk/RelativePositionPropImageFilter.h
index 11797e7..c2391e7 100644
--- a/itk/RelativePositionPropImageFilter.h
+++ b/itk/RelativePositionPropImageFilter.h
@@ -81,17 +81,10 @@ namespace itk
    *   This filter is implemented using the propagation algorithm
    */
 
-#if ITK_VERSION_MAJOR == 4
   template <class TInputImage, class TOutputImage, class TtNorm=Functor::Minimum<
                                                      typename TOutputImage::PixelType,
                                                      typename TOutputImage::PixelType,
                                                      typename TOutputImage::PixelType>  >
-#else
-  template <class TInputImage, class TOutputImage, class TtNorm=Function::Minimum<
-                                                     typename TOutputImage::PixelType,
-                                                     typename TOutputImage::PixelType,
-                                                     typename TOutputImage::PixelType>  >
-#endif
   class ITK_EXPORT RelativePositionPropImageFilter :
     public ImageToImageFilter< TInputImage, TOutputImage > 
   {
@@ -176,26 +169,29 @@ namespace itk
       }
     }
   
-
-    virtual void GenerateInputRequestedRegion() throw(InvalidRequestedRegionError);
-    void EnlargeOutputRequestedRegion (DataObject * output);
+#if ( ( ITK_VERSION_MAJOR == 4 ) && ( ITK_VERSION_MINOR > 12 ) || ( ITK_VERSION_MAJOR > 4 ))
+    virtual void GenerateInputRequestedRegion() ITK_OVERRIDE;
+#else
+   virtual void GenerateInputRequestedRegion() throw(InvalidRequestedRegionError) ITK_OVERRIDE;
+#endif
+    void EnlargeOutputRequestedRegion (DataObject * output) ITK_OVERRIDE;
 
   protected:
     RelativePositionPropImageFilter()
       {
         m_Alpha1 = 0;
         m_Alpha2 = 0;
-        m_K1 = vcl_acos(-1.0)/2;
+        m_K1 = std::acos(-1.0)/2;
         // m_K2 = 3.1417/2;
         m_Radius = 2; // DS
         m_Fast = true; // DS
         m_VerboseProgress = false;
       }
     virtual ~RelativePositionPropImageFilter() {}
-    void PrintSelf(std::ostream& os, Indent indent) const;
+    void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE;
 
     //void GenerateThreadedData(const typename TOutputImage::RegionType& outputRegionForThread, int threadId);
-    void GenerateData();
+    void GenerateData() ITK_OVERRIDE;
 
   private:
     RelativePositionPropImageFilter(const Self&); //purposely not implemented