[Liblas-commits] libpc: fixed bad types

[liblas-commits at liblas.org]

details:   http://hg.liblas.orglibpc/rev/9ccbaa4f4705
changeset: 168:9ccbaa4f4705
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Thu Mar 03 16:46:50 2011 -0800
description:
fixed bad types

diffstat:

 src/FauxWriter.cpp             |   6 +++---
 src/drivers/liblas/writer.cpp  |   6 +++---
 test/unit/FauxReaderTest.cpp   |  16 ++++++++--------
 test/unit/LiblasReaderTest.cpp |   6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diffs (81 lines):

diff -r 95b6b16e10c2 -r 9ccbaa4f4705 src/FauxWriter.cpp
--- a/src/FauxWriter.cpp	Thu Mar 03 16:44:46 2011 -0800
+++ b/src/FauxWriter.cpp	Thu Mar 03 16:46:50 2011 -0800
@@ -94,9 +94,9 @@
     const boost::uint32_t numPoints = pointData.getNumPoints();
 
     const Schema& schema = pointData.getSchemaLayout().getSchema();
-    const std::size_t fieldIndexX = schema.getDimensionIndex(Dimension::Field_X);
-    const std::size_t fieldIndexY = schema.getDimensionIndex(Dimension::Field_Y);
-    const std::size_t fieldIndexZ = schema.getDimensionIndex(Dimension::Field_Z);
+    const int fieldIndexX = schema.getDimensionIndex(Dimension::Field_X);
+    const int fieldIndexY = schema.getDimensionIndex(Dimension::Field_Y);
+    const int fieldIndexZ = schema.getDimensionIndex(Dimension::Field_Z);
 
     boost::uint32_t numValidPoints = 0;
     for (boost::uint32_t pointIndex=0; pointIndex<numPoints; pointIndex++)
diff -r 95b6b16e10c2 -r 9ccbaa4f4705 src/drivers/liblas/writer.cpp
--- a/src/drivers/liblas/writer.cpp	Thu Mar 03 16:44:46 2011 -0800
+++ b/src/drivers/liblas/writer.cpp	Thu Mar 03 16:46:50 2011 -0800
@@ -93,9 +93,9 @@
     setSystemIdentifier("libPC");
     setGeneratingSoftware(GetVersionString());
 
-    std::size_t indexX = getHeader().getSchema().getDimensionIndex(Dimension::Field_X);
-    std::size_t indexY = getHeader().getSchema().getDimensionIndex(Dimension::Field_Y);
-    std::size_t indexZ = getHeader().getSchema().getDimensionIndex(Dimension::Field_Z);
+    int indexX = getHeader().getSchema().getDimensionIndex(Dimension::Field_X);
+    int indexY = getHeader().getSchema().getDimensionIndex(Dimension::Field_Y);
+    int indexZ = getHeader().getSchema().getDimensionIndex(Dimension::Field_Z);
     const Dimension& dimX = getHeader().getSchema().getDimension(indexX);
     const Dimension& dimY = getHeader().getSchema().getDimension(indexY);
     const Dimension& dimZ = getHeader().getSchema().getDimension(indexZ);
diff -r 95b6b16e10c2 -r 9ccbaa4f4705 test/unit/FauxReaderTest.cpp
--- a/test/unit/FauxReaderTest.cpp	Thu Mar 03 16:44:46 2011 -0800
+++ b/test/unit/FauxReaderTest.cpp	Thu Mar 03 16:46:50 2011 -0800
@@ -56,10 +56,10 @@
 
     BOOST_CHECK(numRead == 750);
 
-    std::size_t offsetX = schema.getDimensionIndex(Dimension::Field_X);
-    std::size_t offsetY = schema.getDimensionIndex(Dimension::Field_Y);
-    std::size_t offsetZ = schema.getDimensionIndex(Dimension::Field_Z);
-    std::size_t offsetT = schema.getDimensionIndex(Dimension::Field_GpsTime);
+    int offsetX = schema.getDimensionIndex(Dimension::Field_X);
+    int offsetY = schema.getDimensionIndex(Dimension::Field_Y);
+    int offsetZ = schema.getDimensionIndex(Dimension::Field_Z);
+    int offsetT = schema.getDimensionIndex(Dimension::Field_GpsTime);
 
     for (boost::uint32_t i=0; i<numRead; i++)
     {
@@ -92,10 +92,10 @@
 
     BOOST_CHECK(numRead == 750);
 
-    std::size_t offsetX = schema.getDimensionIndex(Dimension::Field_X);
-    std::size_t offsetY = schema.getDimensionIndex(Dimension::Field_Y);
-    std::size_t offsetZ = schema.getDimensionIndex(Dimension::Field_Z);
-    std::size_t offsetT = schema.getDimensionIndex(Dimension::Field_GpsTime);
+    int offsetX = schema.getDimensionIndex(Dimension::Field_X);
+    int offsetY = schema.getDimensionIndex(Dimension::Field_Y);
+    int offsetZ = schema.getDimensionIndex(Dimension::Field_Z);
+    int offsetT = schema.getDimensionIndex(Dimension::Field_GpsTime);
 
     for (boost::uint32_t i=0; i<numRead; i++)
     {
diff -r 95b6b16e10c2 -r 9ccbaa4f4705 test/unit/LiblasReaderTest.cpp
--- a/test/unit/LiblasReaderTest.cpp	Thu Mar 03 16:44:46 2011 -0800
+++ b/test/unit/LiblasReaderTest.cpp	Thu Mar 03 16:46:50 2011 -0800
@@ -48,9 +48,9 @@
 static void checkPointXYZ(const PointData& data, size_t index, const Schema& schema, 
                           double xref, double yref, double zref)
 {
-    std::size_t offsetX = schema.getDimensionIndex(Dimension::Field_X);
-    std::size_t offsetY = schema.getDimensionIndex(Dimension::Field_Y);
-    std::size_t offsetZ = schema.getDimensionIndex(Dimension::Field_Z);
+    int offsetX = schema.getDimensionIndex(Dimension::Field_X);
+    int offsetY = schema.getDimensionIndex(Dimension::Field_Y);
+    int offsetZ = schema.getDimensionIndex(Dimension::Field_Z);
 
     boost::int32_t x0raw = data.getField<boost::int32_t>(index, offsetX);
     boost::int32_t y0raw = data.getField<boost::int32_t>(index, offsetY);