[Liblas-commits] hg: regularize liblas::Bounds 3d constructor

[liblas-commits at liblas.org]

changeset 75f49aa797a6 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=75f49aa797a6
summary: regularize liblas::Bounds 3d constructor

diffstat:

 include/liblas/lasbounds.hpp |  2 +-
 include/liblas/lasfilter.hpp |  2 +-
 src/lasfilter.cpp            |  2 +-
 src/lasheader.cpp            |  5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r a17bad855c63 -r 75f49aa797a6 include/liblas/lasbounds.hpp
--- a/include/liblas/lasbounds.hpp	Thu Aug 12 11:11:02 2010 -0500
+++ b/include/liblas/lasbounds.hpp	Thu Aug 12 12:27:44 2010 -0500
@@ -88,9 +88,9 @@
 
 Bounds( T minx, 
         T miny, 
+        T minz, 
         T maxx, 
         T maxy, 
-        T minz, 
         T maxz)
 {
     mins.resize(3);
diff -r a17bad855c63 -r 75f49aa797a6 include/liblas/lasfilter.hpp
--- a/include/liblas/lasfilter.hpp	Thu Aug 12 11:11:02 2010 -0500
+++ b/include/liblas/lasfilter.hpp	Thu Aug 12 12:27:44 2010 -0500
@@ -91,7 +91,7 @@
 public:
     
     BoundsFilter(double minx, double miny, double maxx, double maxy);
-    BoundsFilter(double minx, double miny, double maxx, double maxy, double minz, double maxz);
+    BoundsFilter(double minx, double miny, double minz, double maxx, double maxy, double maxz);
     BoundsFilter(Bounds<double> const& bounds);
     bool filter(const Point& point);
 
diff -r a17bad855c63 -r 75f49aa797a6 src/lasfilter.cpp
--- a/src/lasfilter.cpp	Thu Aug 12 11:11:02 2010 -0500
+++ b/src/lasfilter.cpp	Thu Aug 12 12:27:44 2010 -0500
@@ -89,7 +89,7 @@
     m_2d = true;
 }
 
-BoundsFilter::BoundsFilter( double minx, double miny, double maxx, double maxy, double minz, double maxz ) : FilterI(eInclusion)
+BoundsFilter::BoundsFilter( double minx, double miny, double minz, double maxx, double maxy, double maxz ) : FilterI(eInclusion)
 {
     mins[0] = minx;
     mins[1] = miny;
diff -r a17bad855c63 -r 75f49aa797a6 src/lasheader.cpp
--- a/src/lasheader.cpp	Thu Aug 12 11:11:02 2010 -0500
+++ b/src/lasheader.cpp	Thu Aug 12 12:27:44 2010 -0500
@@ -520,12 +520,13 @@
 void Header::SetMax(double x, double y, double z)
 {
     // m_extent = Bounds(m_extent.min(0), m_extent.min(1), m_extent.max(0), m_extent.max(1), m_extent.min(2), m_extent.max(2));
-    m_extent = Bounds<double>(m_extent.min(0), m_extent.min(1), x, y, m_extent.min(2), z);
+    // Bounds(minx, miny, minz, maxx, maxy, maxz)
+    m_extent = Bounds<double>(m_extent.min(0), m_extent.min(1), m_extent.min(2), x, y, z);
 }
 
 void Header::SetMin(double x, double y, double z)
 {
-    m_extent = Bounds<double>(x, y, m_extent.max(0), m_extent.max(1), z, m_extent.max(2));
+    m_extent = Bounds<double>(x, y, z, m_extent.max(0), m_extent.max(1), m_extent.max(2));
 }
 
 void Header::SetExtent(Bounds<double> const& extent)