[Liblas-commits] hg: 2 new changesets

[liblas-commits at liblas.org]

changeset 8faa8065ae7c in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=8faa8065ae7c
summary: don't test padded UserIds when looking for geokeys

changeset e5eb20a4b707 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=e5eb20a4b707
summary: merge commit

diffstat:

 src/lasheader.cpp            |   2 +-
 test/unit/laspoint_test.cpp  |  10 +++++-----
 test/unit/lasreader_test.cpp |   2 +-
 test/unit/laswriter_test.cpp |   4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs (93 lines):

diff -r ba788b577724 -r e5eb20a4b707 src/lasheader.cpp
--- a/src/lasheader.cpp	Thu Dec 31 10:57:48 2009 -0600
+++ b/src/lasheader.cpp	Thu Dec 31 12:01:59 2009 -0600
@@ -603,7 +603,7 @@
     {
         LASVariableRecord record = *i;
 
-        if (record.GetUserId(true) == uid)
+        if (record.GetUserId(false) == uid)
         {
             uint16_t const id = record.GetRecordId();
             if (34735 == id)
diff -r ba788b577724 -r e5eb20a4b707 test/unit/laspoint_test.cpp
--- a/test/unit/laspoint_test.cpp	Thu Dec 31 10:57:48 2009 -0600
+++ b/test/unit/laspoint_test.cpp	Thu Dec 31 12:01:59 2009 -0600
@@ -105,7 +105,7 @@
         }
         catch (liblas::invalid_point_data const& e)
         {
-            ensure_equals(e.who() & liblas::LASPoint::eReturnNumber,
+            ensure_equals(e.who(), liblas::LASPoint::eReturnNumber,
                 liblas::LASPoint::eReturnNumber);
         }
     }
@@ -140,7 +140,7 @@
         }
         catch (liblas::invalid_point_data const& e)
         {
-            ensure_equals(e.who() & liblas::LASPoint::eNumberOfReturns,
+            ensure_equals(e.who(), liblas::LASPoint::eNumberOfReturns,
                 liblas::LASPoint::eNumberOfReturns);
         }
     }
@@ -175,7 +175,7 @@
         }
         catch (liblas::invalid_point_data const& e)
         {
-            ensure_equals(e.who() & liblas::LASPoint::eScanDirection,
+            ensure_equals(e.who(), liblas::LASPoint::eScanDirection,
                 liblas::LASPoint::eScanDirection);
         }
     }
@@ -210,7 +210,7 @@
         }
         catch (liblas::invalid_point_data const& e)
         {
-            ensure_equals(e.who() & liblas::LASPoint::eFlightLineEdge,
+            ensure_equals(e.who(), liblas::LASPoint::eFlightLineEdge,
                 liblas::LASPoint::eFlightLineEdge);
         }
     }
@@ -293,7 +293,7 @@
         }
         catch (liblas::invalid_point_data const& e)
         {
-            ensure_equals(e.who() & liblas::LASPoint::eScanAngleRank,
+            ensure_equals(e.who(), liblas::LASPoint::eScanAngleRank,
                 liblas::LASPoint::eScanAngleRank);
         }
     }
diff -r ba788b577724 -r e5eb20a4b707 test/unit/lasreader_test.cpp
--- a/test/unit/lasreader_test.cpp	Thu Dec 31 10:57:48 2009 -0600
+++ b/test/unit/lasreader_test.cpp	Thu Dec 31 12:01:59 2009 -0600
@@ -41,7 +41,7 @@
         ifs.open(file10_.c_str(), std::ios::in | std::ios::binary);
         liblas::LASReader reader(ifs);
 
-        ensure_equals<std::size_t>(reader.GetVersion(), liblas::eLASVersion10);
+        ensure_equals(reader.GetVersion(), liblas::eLASVersion10);
     }
 
     // Test reading header
diff -r ba788b577724 -r e5eb20a4b707 test/unit/laswriter_test.cpp
--- a/test/unit/laswriter_test.cpp	Thu Dec 31 10:57:48 2009 -0600
+++ b/test/unit/laswriter_test.cpp	Thu Dec 31 12:01:59 2009 -0600
@@ -62,7 +62,7 @@
             liblas::LASHeader header;
             liblas::LASWriter writer(ofs, header);
 
-            ensure_equals<std::size_t>(writer.GetVersion(), liblas::eLASVersion12);
+            ensure_equals(writer.GetVersion(), liblas::eLASVersion12);
 
             liblas::LASHeader const& hdr_default = writer.GetHeader();
             test_default_header(hdr_default);
@@ -76,7 +76,7 @@
 
             liblas::LASReader reader(ifs);
 
-            ensure_equals<std::size_t>(reader.GetVersion(), liblas::eLASVersion12);
+            ensure_equals(reader.GetVersion(), liblas::eLASVersion12);
             
             liblas::LASHeader const& hdr_default = reader.GetHeader();
             test_default_header(hdr_default);