[SCM] WorldForge math library branch, master, updated. debian/0.3.11-1_RFS1-20-gaa401be

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit aa401befec5fb332a7a383b3c5db60e7e49242c3
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Thu Feb 16 17:23:05 2012 -0500

    added 0001-float-comparisons.patch
    
      - fixes floating-point comparisons that cause FTBFS in the test suite on
        some architectures

diff --git a/debian/changelog b/debian/changelog
index dc3154e..fa9f381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 wfmath (0.3.12-2) UNRELEASED; urgency=low
 
   * marked some inline symbols optional
+  * added 0001-float-comparisons.patch
+    - fixes floating-point comparisons that cause FTBFS in the test suite on
+      some architectures
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Fri, 03 Feb 2012 09:38:53 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Thu, 16 Feb 2012 17:21:50 -0500
 
 wfmath (0.3.12-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-float-comparisons.patch b/debian/patches/0001-float-comparisons.patch
new file mode 100644
index 0000000..9be1c89
--- /dev/null
+++ b/debian/patches/0001-float-comparisons.patch
@@ -0,0 +1,23 @@
+Description: fix float comparisons that cause FTBFS on some architectures
+Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
+
+--- a/wfmath/intersect_decls.h
++++ b/wfmath/intersect_decls.h
+@@ -34,7 +34,7 @@
+ 
+ inline bool _Less(CoordType x1, CoordType x2, bool proper)
+ {
+-  return !proper ? x1 < x2 : x1 <= x2;
++  return proper ? x1 <= x2 : (x2 - x1) > WFMATH_EPSILON;
+ }
+ 
+ inline bool _LessEq(CoordType x1, CoordType x2, bool proper)
+@@ -44,7 +44,7 @@
+ 
+ inline bool _Greater(CoordType x1, CoordType x2, bool proper)
+ {
+-  return !proper ? x1 > x2 : x1 >= x2;
++  return proper ? x1 >= x2 : (x1 - x2) > WFMATH_EPSILON;
+ }
+ 
+ inline bool _GreaterEq(CoordType x1, CoordType x2, bool proper)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..37049ab
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-float-comparisons.patch

-- 
WorldForge math library