X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FRelativePositionPropImageFilter.h;h=c2391e7b538a16cbf06ba0ad0eddfe77d0b0a56c;hb=342abd5c807dab47a30d8369aca8f7e5c9242b2b;hp=c4f081287b2b469176c15352bc5c902a2240d866;hpb=1865f86b7420682f57e160c911cfebabbfaa8375;p=clitk.git

diff --git a/itk/RelativePositionPropImageFilter.h b/itk/RelativePositionPropImageFilter.h
index c4f0812..c2391e7 100644
--- a/itk/RelativePositionPropImageFilter.h
+++ b/itk/RelativePositionPropImageFilter.h
@@ -169,8 +169,11 @@ namespace itk
       }
     }
   
-
-    virtual void GenerateInputRequestedRegion() throw(InvalidRequestedRegionError) ITK_OVERRIDE;
+#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:
@@ -178,7 +181,7 @@ namespace itk
       {
         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