Changeset 526:feff4c1f2cb2

Timestamp:

04/23/08 15:45:14 (2 years ago)

Author:

Mateusz Loskot <mateusz@…>

Branch:

default

Convert:

svn:1766ff46-f334-0410-ab20-d63176f87757/trunk@591

Message:

Fixed bug in LASHeader with returning string members generated with non-null-ended bytes arrays.

File:

• src/lasheader.cpp (modified) (6 diffs)

src/lasheader.cpp

@@ -57 +57 @@
     p = std::memcpy(m_signature, other.m_signature, eFileSignatureSize);
     assert(p == m_signature);
-//    m_signature = other.m_signature;
     p = std::memcpy(m_projectId4, other.m_projectId4, eProjectId4Size); 
     assert(p == m_projectId4);
     p = std::memcpy(m_systemId, other.m_systemId, eSystemIdSize);
     assert(p == m_systemId);
-//    m_systemId = other.m_systemId;
     p = std::memcpy(m_softwareId, other.m_softwareId, eSoftwareIdSize);
     assert(p == m_softwareId);
-//    m_softwareId = other.m_softwareId;
     std::vector<uint32_t>(other.m_pointRecordsByReturn).swap(m_pointRecordsByReturn);
     assert(ePointsByReturnSize >= m_pointRecordsByReturn.size());
@@ -78 +75 @@
         p = std::memcpy(m_signature, rhs.m_signature, eFileSignatureSize);
         assert(p == m_signature);
-//        m_signature = rhs.m_signature;
         m_sourceId = rhs.m_sourceId;
         m_reserved = rhs.m_reserved;
@@ -90 +86 @@
         p = std::memcpy(m_systemId, rhs.m_systemId, eSystemIdSize);
         assert(p == m_systemId);
-        //m_systemId = rhs.m_systemId;
         p = std::memcpy(m_softwareId, rhs.m_softwareId, eSoftwareIdSize);
         assert(p == m_softwareId);
-        //m_softwareId = rhs.m_softwareId;
         m_createDOY = rhs.m_createDOY;
         m_createYear = rhs.m_createYear;
@@ -147 +141 @@
 std::string LASHeader::GetFileSignature() const
 {
-    return m_signature;
+    return std::string(m_signature, eFileSignatureSize);
 }
 
@@ -215 +209 @@
 std::string LASHeader::GetSystemId(bool pad /*= false*/) const
 {
-    std::string tmp(m_systemId);
+    // copy array of chars and trim zeros if smaller than 32 bytes
+    std::string tmp(std::string(m_systemId, eSystemIdSize).c_str());
 
     // pad right side with spaces
@@ -239 +234 @@
 }
 
-std::string  LASHeader::GetSoftwareId(bool pad /*= false*/) const
-{
-    std::string tmp(m_softwareId);
+std::string LASHeader::GetSoftwareId(bool pad /*= false*/) const
+{
+    std::string tmp(std::string(m_softwareId, eSoftwareIdSize).c_str());
 
     // pad right side with spaces