[Liblas-commits] hg: use wkt comparison again for now

[liblas-commits at liblas.org]

details:   http://hg.liblas.orghg/rev/14eef3e83c6e
changeset: 3055:14eef3e83c6e
user:      Howard Butler <hobu.inc at gmail.com>
date:      Thu Jun 30 11:50:10 2011 -0500
description:
use wkt comparison again for now
Subject: hg: fully qualify integer types

details:   http://hg.liblas.orghg/rev/97b18d019ce7
changeset: 3056:97b18d019ce7
user:      Howard Butler <hobu.inc at gmail.com>
date:      Thu Jun 30 11:51:27 2011 -0500
description:
fully qualify integer types

diffstat:

 apps/kdx_util.cpp                   |  10 +++++-----
 test/unit/spatialreference_test.cpp |   6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (52 lines):

diff -r 5b2e24d3b1e8 -r 97b18d019ce7 apps/kdx_util.cpp
--- a/apps/kdx_util.cpp	Thu Jun 30 11:27:11 2011 -0500
+++ b/apps/kdx_util.cpp	Thu Jun 30 11:51:27 2011 -0500
@@ -204,21 +204,21 @@
     point_data.push_back(edgeOfFlightLine_b[0]);
     point_data.push_back(scanAngleRank_b[0]);
     point_data.push_back(userData_b[0]);
-    for (int i = sizeof(uint16_t) - 1; i >= 0; i--) {
+    for (int i = sizeof(boost::uint16_t) - 1; i >= 0; i--) {
         point_data.push_back(pointSourceId_b[i]);
     }
 
     // Pack dimension with RGBA for a total of 8 bytes
-    for (int i = sizeof(uint16_t) - 1; i >= 0; i--) {
+    for (int i = sizeof(boost::uint16_t) - 1; i >= 0; i--) {
         point_data.push_back(red_b[i]);
     }    
-    for (int i = sizeof(uint16_t) - 1; i >= 0; i--) {
+    for (int i = sizeof(boost::uint16_t) - 1; i >= 0; i--) {
         point_data.push_back(green_b[i]);
     }    
-    for (int i = sizeof(uint16_t) - 1; i >= 0; i--) {
+    for (int i = sizeof(boost::uint16_t) - 1; i >= 0; i--) {
         point_data.push_back(blue_b[i]);
     }    
-    for (int i = sizeof(uint16_t) - 1; i >= 0; i--) {
+    for (int i = sizeof(boost::uint16_t) - 1; i >= 0; i--) {
         point_data.push_back(alpha_b[i]);
     }    
 
diff -r 5b2e24d3b1e8 -r 97b18d019ce7 test/unit/spatialreference_test.cpp
--- a/test/unit/spatialreference_test.cpp	Thu Jun 30 11:27:11 2011 -0500
+++ b/test/unit/spatialreference_test.cpp	Thu Jun 30 11:51:27 2011 -0500
@@ -70,15 +70,15 @@
     void to::test<3>()
     {
         liblas::SpatialReference ref;
-        const char* proj4_c = "+proj=utm +zone=15 +datum=WGS84 +units=m +no_defs ";
+        const char* proj4_c = "+proj=utm +zone=15 +ellps=WGS84 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs ";
         ref.SetProj4(proj4_c);
 
         liblas::SpatialReference ref2;
         ref2.SetProj4(ref.GetProj4());
         
-        ensure_equals("Proj.4 i/o", ref, ref2);
+        // ensure_equals("Proj.4 i/o", ref, ref2);
         
-        // ensure_equals("Proj.4 comparison", ref.GetProj4(), proj4_c);
+        ensure_equals("Proj.4 comparison", ref.GetProj4(), proj4_c);
         
     }