[Liblas-commits] hg: use a concrete point reference in
detail::reader::Point
liblas-commits at liblas.org
liblas-commits at liblas.org
Tue Aug 17 14:27:22 EDT 2010
changeset 631eeaa724f6 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=631eeaa724f6
summary: use a concrete point reference in detail::reader::Point
diffstat:
include/liblas/detail/reader/point.hpp | 4 ++--
src/detail/reader/point.cpp | 34 +++++++++++++++++-----------------
2 files changed, 19 insertions(+), 19 deletions(-)
diffs (120 lines):
diff -r 0ed40975a132 -r 631eeaa724f6 include/liblas/detail/reader/point.hpp
--- a/include/liblas/detail/reader/point.hpp Tue Aug 17 09:55:57 2010 -0500
+++ b/include/liblas/detail/reader/point.hpp Tue Aug 17 13:27:16 2010 -0500
@@ -63,7 +63,7 @@
virtual ~Point();
std::istream& GetStream() const;
- const liblas::Point& GetPoint() const { return *m_point; }
+ const liblas::Point& GetPoint() const { return m_point; }
void read();
protected:
@@ -79,7 +79,7 @@
std::istream& m_ifs;
HeaderPtr m_header;
- PointPtr m_point;
+ liblas::Point m_point;
std::vector<boost::uint8_t> m_raw_data;
void setup();
diff -r 0ed40975a132 -r 631eeaa724f6 src/detail/reader/point.cpp
--- a/src/detail/reader/point.cpp Tue Aug 17 09:55:57 2010 -0500
+++ b/src/detail/reader/point.cpp Tue Aug 17 13:27:16 2010 -0500
@@ -58,7 +58,7 @@
Point::Point(std::istream& ifs, HeaderPtr header)
: m_ifs(ifs)
, m_header(header)
- , m_point(new liblas::Point())
+
{
setup();
}
@@ -75,16 +75,16 @@
void Point::fill(PointRecord& record)
{
- m_point->SetX(record.x);
- m_point->SetY(record.y);
- m_point->SetZ(record.z);
+ m_point.SetX(record.x);
+ m_point.SetY(record.y);
+ m_point.SetZ(record.z);
- m_point->SetIntensity(record.intensity);
- m_point->SetScanFlags(record.flags);
- m_point->SetClassification((record.classification));
- m_point->SetScanAngleRank(record.scan_angle_rank);
- m_point->SetUserData(record.user_data);
- m_point->SetPointSourceID(record.point_source_id);
+ m_point.SetIntensity(record.intensity);
+ m_point.SetScanFlags(record.flags);
+ m_point.SetClassification((record.classification));
+ m_point.SetScanAngleRank(record.scan_angle_rank);
+ m_point.SetUserData(record.user_data);
+ m_point.SetPointSourceID(record.point_source_id);
}
void Point::read()
@@ -101,7 +101,7 @@
// Set the header for the point early because
// SetCoordinates will use it later to scale the
// point
- m_point->SetHeader(m_header);
+ m_point.SetHeader(m_header);
try
{
@@ -125,13 +125,13 @@
memcpy(&record.point_source_id, &(m_raw_data[i]), sizeof(uint16_t)); i+=sizeof(uint16_t);
fill(record);
- m_point->SetCoordinates(m_point->GetX(), m_point->GetY(), m_point->GetZ());
+ m_point.SetCoordinates(m_point.GetX(), m_point.GetY(), m_point.GetZ());
if (m_header->GetSchema().HasTime())
{
memcpy(&gpst, &(m_raw_data[i]), sizeof(double));
- m_point->SetTime(gpst);
+ m_point.SetTime(gpst);
i += sizeof(double);
if (m_header->GetSchema().HasColor())
@@ -141,7 +141,7 @@
memcpy(&blue, &(m_raw_data[i]), sizeof(uint16_t));
liblas::Color color(red, green, blue);
- m_point->SetColor(color);
+ m_point.SetColor(color);
i += 3 * sizeof(uint16_t);
}
@@ -153,7 +153,7 @@
memcpy(&blue, &(m_raw_data[i]), sizeof(uint16_t));
liblas::Color color(red, green, blue);
- m_point->SetColor(color);
+ m_point.SetColor(color);
i += 3 * sizeof(uint16_t);
}
@@ -168,7 +168,7 @@
data.resize(bytesleft);
memcpy(&(data.front()), &(m_raw_data[i]), bytesleft);
- m_point->SetExtraData(data);
+ m_point.SetExtraData(data);
i = i + bytesleft;
}
@@ -184,7 +184,7 @@
}
// Put the data on the point
- m_point->SetData(m_raw_data);
+ m_point.SetData(m_raw_data);
}
void Point::setup()
More information about the Liblas-commits
mailing list