[Liblas-commits] libpc: explicitly inline these dudes

[liblas-commits at liblas.org]

details:   http://hg.liblas.orglibpc/rev/6df2913f8690
changeset: 149:6df2913f8690
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Tue Mar 01 15:33:05 2011 -0800
description:
explicitly inline these dudes
Subject: libpc: bump up blocking factor, again

details:   http://hg.liblas.orglibpc/rev/73341fd2746f
changeset: 150:73341fd2746f
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Tue Mar 01 15:33:31 2011 -0800
description:
bump up blocking factor, again
Subject: libpc: better point format control

details:   http://hg.liblas.orglibpc/rev/54c7bc3e6e05
changeset: 151:54c7bc3e6e05
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Tue Mar 01 15:33:58 2011 -0800
description:
better point format control

diffstat:

 include/libpc/PointData.hpp   |  4 ++--
 src/Writer.cpp                |  2 +-
 src/drivers/liblas/reader.cpp |  5 +++++
 src/drivers/liblas/reader.hpp |  2 ++
 src/drivers/liblas/writer.cpp |  2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diffs (72 lines):

diff -r ee76332d0836 -r 54c7bc3e6e05 include/libpc/PointData.hpp
--- a/include/libpc/PointData.hpp	Tue Mar 01 15:32:03 2011 -0800
+++ b/include/libpc/PointData.hpp	Tue Mar 01 15:33:58 2011 -0800
@@ -116,7 +116,7 @@
 
 
 template <class T>
-void PointData::setField(std::size_t pointIndex, std::size_t fieldIndex, T value)
+inline void PointData::setField(std::size_t pointIndex, std::size_t fieldIndex, T value)
 {
     std::size_t offset = (pointIndex * m_pointSize) + m_schemaLayout.getDimensionLayout(fieldIndex).getByteOffset();
     assert(offset + sizeof(T) <= m_pointSize * m_numPoints);
@@ -127,7 +127,7 @@
 
 
 template <class T>
-T PointData::getField(std::size_t pointIndex, std::size_t fieldIndex) const
+inline T PointData::getField(std::size_t pointIndex, std::size_t fieldIndex) const
 {
     std::size_t offset = (pointIndex * m_pointSize) + m_schemaLayout.getDimensionLayout(fieldIndex).getByteOffset();
     assert(offset + sizeof(T) <= m_pointSize * m_numPoints);
diff -r ee76332d0836 -r 54c7bc3e6e05 src/Writer.cpp
--- a/src/Writer.cpp	Tue Mar 01 15:32:03 2011 -0800
+++ b/src/Writer.cpp	Tue Mar 01 15:33:58 2011 -0800
@@ -40,7 +40,7 @@
 namespace libpc
 {
 
-const boost::uint32_t Writer::s_defaultChunkSize = 1024;
+const boost::uint32_t Writer::s_defaultChunkSize = 1024 * 32;
 
 
 Writer::Writer(Stage& prevStage)
diff -r ee76332d0836 -r 54c7bc3e6e05 src/drivers/liblas/reader.cpp
--- a/src/drivers/liblas/reader.cpp	Tue Mar 01 15:32:03 2011 -0800
+++ b/src/drivers/liblas/reader.cpp	Tue Mar 01 15:33:58 2011 -0800
@@ -90,6 +90,11 @@
 }
 
 
+boost::int8_t LiblasReader::getPointFormatNumber() const
+{
+    return (boost::uint8_t)m_pointFormat;
+}
+
 void LiblasReader::processExternalHeader()
 {
     const liblas::Header& externalHeader = m_externalReader->GetHeader();
diff -r ee76332d0836 -r 54c7bc3e6e05 src/drivers/liblas/reader.hpp
--- a/src/drivers/liblas/reader.hpp	Tue Mar 01 15:32:03 2011 -0800
+++ b/src/drivers/liblas/reader.hpp	Tue Mar 01 15:33:58 2011 -0800
@@ -73,6 +73,8 @@
 
     const LiblasHeader& getLiblasHeader() const;
 
+    boost::int8_t getPointFormatNumber() const;
+
 private:
     LiblasHeader& getLiblasHeader();
     void setLiblasHeader(const LiblasHeader&);
diff -r ee76332d0836 -r 54c7bc3e6e05 src/drivers/liblas/writer.cpp
--- a/src/drivers/liblas/writer.cpp	Tue Mar 01 15:32:03 2011 -0800
+++ b/src/drivers/liblas/writer.cpp	Tue Mar 01 15:33:58 2011 -0800
@@ -86,7 +86,7 @@
 void LiblasWriter::setupExternalHeader()
 {
     setFormatVersion(1,2);
-    setPointFormat(0);
+    setPointFormat(3);
 
     setCompressed(false);