INTEGRATION: CWS aw051 (1.10.24); FILE MERGED

2007/06/15 13:28:59 aw 1.10.24.1: #i77162# 3rd round of adaptions to B2DPolygon bezier handling

1 files changed, 4 insertions, 29 deletions

diff --git a/basegfx/inc/basegfx/numeric/ftools.hxx b/basegfx/inc/basegfx/numeric/ftools.hxx
index de9bd30b2923..20d72a7d1f6f 100644
--- a/basegfx/inc/basegfx/numeric/ftools.hxx
+++ b/basegfx/inc/basegfx/numeric/ftools.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ftools.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-13 15:06:20 $
+ *  last change: $Author: obo $ $Date: 2007-07-18 11:02:31 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -155,7 +155,8 @@ namespace basegfx
 
         static bool equal(const double& rfValA, const double& rfValB)
         {
-            return (fabs(rfValB - rfValA) <= getSmallValue());
+            // changed to approxEqual usage for better numerical correctness
+            return rtl::math::approxEqual(rfValA, rfValB);
         }
 
         static bool less(const double& rfValA, const double& rfValB)
@@ -177,32 +178,6 @@ namespace basegfx
         {
             return (rfValA > rfValB || equal(rfValA, rfValB));
         }
-
-
-        static bool equal(const double& rfValA, const double& rfValB, const double& rfSmallValue)
-        {
-            return (fabs(rfValB - rfValA) <= rfSmallValue);
-        }
-
-        static bool less(const double& rfValA, const double& rfValB, const double& rfSmallValue)
-        {
-            return (rfValA < rfValB && !equal(rfValA, rfValB, rfSmallValue));
-        }
-
-        static bool lessOrEqual(const double& rfValA, const double& rfValB, const double& rfSmallValue)
-        {
-            return (rfValA < rfValB || equal(rfValA, rfValB, rfSmallValue));
-        }
-
-        static bool more(const double& rfValA, const double& rfValB, const double& rfSmallValue)
-        {
-            return (rfValA > rfValB && !equal(rfValA, rfValB, rfSmallValue));
-        }
-
-        static bool moreOrEqual(const double& rfValA, const double& rfValB, const double& rfSmallValue)
-        {
-            return (rfValA > rfValB || equal(rfValA, rfValB, rfSmallValue));
-        }
     };
 } // end of namespace basegfx