Drop F_PI1800/F_PI18000, and unify deg2rad/rad2deg conversions

Change-Id: Ib89b00c3dc8cd440e8a88906eea133becd1cef64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125509
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins

1 files changed, 4 insertions, 12 deletions

diff --git a/include/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx
index 63e7a0d460ce..14deaa059020 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -27,14 +27,6 @@
 #include <algorithm>
 
 
-#ifndef F_PI1800
-#define F_PI1800    (M_PI/1800.0)
-#endif
-#ifndef F_PI18000
-#define F_PI18000   (M_PI/18000.0)
-#endif
-
-
 // fTools defines
 
 namespace basegfx
@@ -83,20 +75,20 @@ namespace basegfx
 
     /** Convert value from degrees to radians
      */
-    constexpr double deg2rad( double v )
+    template <int DegMultiple = 1> constexpr double deg2rad( double v )
     {
         // divide first, to get exact values for v being a multiple of
         // 90 degrees
-        return v / 90.0 * M_PI_2;
+        return v / (90.0 * DegMultiple) * M_PI_2;
     }
 
     /** Convert value radians to degrees
      */
-    constexpr double rad2deg( double v )
+    template <int DegMultiple = 1> constexpr double rad2deg( double v )
     {
         // divide first, to get exact values for v being a multiple of
         // pi/2
-        return v / M_PI_2 * 90.0;
+        return v / M_PI_2 * (90.0 * DegMultiple);
     }
 
     /** Snap v to nearest multiple of fStep, from negative and