[Boost-commit] svn:boost r76886 - trunk/boost/geometry/strategies/cartesian

Subject: [Boost-commit] svn:boost r76886 - trunk/boost/geometry/strategies/cartesian
From: barend.gehrels_at_[hidden]
Date: 2012-02-04 12:40:33

Author: barendgehrels
Date: 2012-02-04 12:40:32 EST (Sat, 04 Feb 2012)
New Revision: 76886
URL: http://svn.boost.org/trac/boost/changeset/76886

Log:
Compile fix, geometry namespace should be there for side (in some scenarios).
Numeric fix, centroid should use !equals and not !=
Text files modified: 
   trunk/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp |     2 +-                                      
   trunk/boost/geometry/strategies/cartesian/side_by_triangle.hpp        |     2 +-                                      
   2 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp
==============================================================================
--- trunk/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp	(original)
+++ trunk/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp	2012-02-04 12:40:32 EST (Sat, 04 Feb 2012)
@@ -188,7 +188,7 @@
     static inline bool result(sums const& state, Point& centroid)
     {
         calculation_type const zero = calculation_type();
-        if (state.count > 0 && state.sum_a2 != zero)
+        if (state.count > 0 && ! math::equals(state.sum_a2, zero))
         {
             calculation_type const v3 = 3;
             calculation_type const a3 = v3 * state.sum_a2;

Modified: trunk/boost/geometry/strategies/cartesian/side_by_triangle.hpp
==============================================================================
--- trunk/boost/geometry/strategies/cartesian/side_by_triangle.hpp	(original)
+++ trunk/boost/geometry/strategies/cartesian/side_by_triangle.hpp	2012-02-04 12:40:32 EST (Sat, 04 Feb 2012)
@@ -86,7 +86,7 @@
         promoted_type const dpy = y - sy1;
 
         promoted_type const s 
-            = detail::determinant<promoted_type>
+            = geometry::detail::determinant<promoted_type>
                 (
                     dx, dy, 
                     dpx, dpy