Changeset 958

Timestamp:

11/06/08 10:42:11 (2 months ago)

Author:

mloskot

Message:

liblas::detail::Point: improved equal-to operation for Point<T> class.

Files:

• trunk/include/liblas/detail/utility.hpp (modified) (4 diffs)

trunk/include/liblas/detail/utility.hpp

@@ -194 +194 @@
 };
 
+template <typename T> 
+bool compare_distance(const T& actual, const T& expected);
+
 template <typename T>
 struct Point
 {
-    Point() : x(T()), y(T()), z(T()) {}
-    Point(T const& x, T const& y, T const& z) : x(x), y(y), z(z) {}
+    Point()
+        : x(T()), y(T()), z(T())
+    {}
+    
+    Point(T const& x, T const& y, T const& z)
+        : x(x), y(y), z(z)
+    {}
+
+    bool equal(Point<T> const& other) const
+    {
+        return (compare_distance(x, other.x)
+                && compare_distance(y, other.y)
+                && compare_distance(z, other.z));
+    }
+
     T x;
     T y;
     T z;
-
-    bool equal(Point<T> const& other) const
-    {
-        return ((x == other.x) && (y == other.y) && (z == other.z));
-    }
 };
 
@@ -224 +235 @@
 struct Extents
 {
-    typename detail::Point < T > min;
-    typename detail::Point < T > max;
+    Extents() {}
+    Extents(detail::Point<T> const& min, detail::Point<T> const& max)
+        : min(min), max(max)
+    {}
 
     bool equal(Extents<T> const& other) const
@@ -231 +244 @@
         return (min == other.min && max == other.max);
     }
+
+    typename detail::Point<T> min;
+    typename detail::Point<T> max;
 };
 
@@ -259 +275 @@
 
 template <typename T> 
-bool compare_doubles(const T& actual, const T& expected) 
+bool compare_distance(const T& actual, const T& expected) 
 { 
     const T epsilon = std::numeric_limits<T>::epsilon();