[Liblas-commits] hg: ConstructVLR doesn't need the format anymore,
this is now av...
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Jun 27 13:29:44 EDT 2011
details: http://hg.liblas.orghg/rev/73bc7006a148
changeset: 3021:73bc7006a148
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Jun 27 12:29:38 2011 -0500
description:
ConstructVLR doesn't need the format anymore, this is now available through the ZipPoint
diffstat:
include/liblas/detail/zippoint.hpp | 2 +-
src/detail/writer/header.cpp | 2 +-
src/detail/zippoint.cpp | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diffs (45 lines):
diff -r 4e2d47c581e6 -r 73bc7006a148 include/liblas/detail/zippoint.hpp
--- a/include/liblas/detail/zippoint.hpp Fri Jun 24 17:07:07 2011 -0700
+++ b/include/liblas/detail/zippoint.hpp Mon Jun 27 12:29:38 2011 -0500
@@ -65,7 +65,7 @@
ZipPoint(PointFormatName, const std::vector<VariableRecord>& vlrs);
~ZipPoint();
- void ConstructVLR(VariableRecord&, PointFormatName format) const;
+ void ConstructVLR(VariableRecord&) const;
// these will return false iff we find a laszip VLR and it doesn't match
// the point format this object wasd constructed with
diff -r 4e2d47c581e6 -r 73bc7006a148 src/detail/writer/header.cpp
--- a/src/detail/writer/header.cpp Fri Jun 24 17:07:07 2011 -0700
+++ b/src/detail/writer/header.cpp Mon Jun 27 12:29:38 2011 -0500
@@ -152,7 +152,7 @@
m_header.DeleteVLRs("laszip encoded", 22204);
ZipPoint zpd(m_header.GetDataFormatId(), m_header.GetVLRs());
VariableRecord v;
- zpd.ConstructVLR(v, m_header.GetDataFormatId());
+ zpd.ConstructVLR(v);
m_header.AddVLR(v);
#else
throw configuration_error("LASzip compression support not enabled in this libLAS configuration.");
diff -r 4e2d47c581e6 -r 73bc7006a148 src/detail/zippoint.cpp
--- a/src/detail/zippoint.cpp Fri Jun 24 17:07:07 2011 -0700
+++ b/src/detail/zippoint.cpp Mon Jun 27 12:29:38 2011 -0500
@@ -163,7 +163,7 @@
}
-void ZipPoint::ConstructVLR(VariableRecord& v, PointFormatName format) const
+void ZipPoint::ConstructVLR(VariableRecord& v) const
{
unsigned char* data;
@@ -181,7 +181,7 @@
v.SetReserved(0xAABB);
v.SetUserId(laszip_userid);
v.SetRecordId(laszip_recordid);
- v.SetRecordLength(num);
+ v.SetRecordLength(static_cast<boost::uint16_t>(num));
v.SetDescription(laszip_description);
v.SetData(vdata);
More information about the Liblas-commits
mailing list