Clear header during initialize.

PDAL · Jul 13, 2020 · 5b2e0ba · 5b2e0ba
1 parent 9f13fa0
commit 5b2e0ba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/io/PcdHeader.cpp b/io/PcdHeader.cpp
@@ -38,6 +38,19 @@
 namespace pdal
 {
 
+void PcdHeader::clear()
+{
+    m_version = PcdVersion::PCD_V6;
+    m_width = 1;
+    m_height = 0;
+    m_pointCount = 0;
+    m_origin = { 0, 0, 0, 0 };
+    m_orientation = { 1, 0, 0, 0 };
+    m_dataOffset = 0;
+    m_fields.clear();
+    m_numLines = 0;
+}
+
 std::istream& operator>>(std::istream& in, PcdVersion& version)
 {
     float f;

diff --git a/io/PcdHeader.hpp b/io/PcdHeader.hpp
@@ -97,10 +97,9 @@ typedef std::vector<PcdField> PcdFieldList;
 struct PcdHeader
 {
     PcdHeader()
-        : m_version(PcdVersion::PCD_V6), m_width(1), m_height(0),
-          m_pointCount(0), m_origin(0, 0, 0, 0), m_orientation(1, 0, 0, 0)
-    {
-    }
+    { clear(); }
+
+    void clear();
 
     PcdVersion m_version;
     PcdFieldList m_fields;

diff --git a/io/PcdReader.cpp b/io/PcdReader.cpp
@@ -245,6 +245,7 @@ void PcdReader::initialize()
         throwError("Can't open file '" + m_filename + "'.");
     try
     {
+        m_header.clear();
         *m_istreamPtr >> m_header;
     }
     catch( ... )