From 182b0489ece30378188a8fe9b3d260289df6433a Mon Sep 17 00:00:00 2001 From: Connor Manning Date: Wed, 7 Jan 2015 10:16:21 -0600 Subject: [PATCH] Fix last GCC warning, and minor tweaks. --- include/pdal/PointBuffer.hpp | 3 +++ include/pdal/PointContext.hpp | 4 +--- io/bpf/BpfReader.cpp | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/pdal/PointBuffer.hpp b/include/pdal/PointBuffer.hpp index 595d6aca03..4014a0fb8f 100644 --- a/include/pdal/PointBuffer.hpp +++ b/include/pdal/PointBuffer.hpp @@ -202,6 +202,9 @@ class PDAL_DLL PointBuffer { return m_context.pointSize(); } std::size_t dimSize(Dimension::Id::Enum id) const { return m_context.dimSize(id); } + DimTypeList dimTypes() const + { return m_context.dimTypes(); } + /// Fill a buffer with point data specified by the dimension list. /// \param[in] dims List of dimensions/types to retrieve. diff --git a/include/pdal/PointContext.hpp b/include/pdal/PointContext.hpp index 438f3009d4..ae3b3754d4 100644 --- a/include/pdal/PointContext.hpp +++ b/include/pdal/PointContext.hpp @@ -52,10 +52,8 @@ namespace plang class BufferedInvocation; } -class DimInfo +struct DimInfo { - friend class PointContext; -public: DimInfo() : m_detail(Dimension::COUNT), m_nextFree(Dimension::PROPRIETARY) {} diff --git a/io/bpf/BpfReader.cpp b/io/bpf/BpfReader.cpp index e4fae01f03..8049b47d77 100644 --- a/io/bpf/BpfReader.cpp +++ b/io/bpf/BpfReader.cpp @@ -287,7 +287,7 @@ point_count_t BpfReader::readPointMajor(PointBuffer& data, point_count_t count) point_count_t BpfReader::readDimMajor(PointBuffer& data, point_count_t count) { - PointId idx; + PointId idx(0); PointId startId = data.size(); point_count_t numRead = 0; for (size_t d = 0; d < m_dims.size(); ++d) @@ -310,7 +310,7 @@ point_count_t BpfReader::readDimMajor(PointBuffer& data, point_count_t count) point_count_t BpfReader::readByteMajor(PointBuffer& data, point_count_t count) { - PointId idx; + PointId idx(0); PointId startId = data.size(); point_count_t numRead = 0;