Fix hard coded struct size

PDAL · Jan 30, 2020 · 946fb64 · 946fb64
1 parent 7cd36a6
commit 946fb64
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/plugins/hdf/io/Hdf5Handler.cpp b/plugins/hdf/io/Hdf5Handler.cpp
@@ -105,6 +105,7 @@ void Hdf5Handler::initialize(
                             int_type.getOrder(),
                             int_type.getSign(),
                             int_type.getSize(),
+                            ctype.getSize(),
                             ctype.getMemberOffset(j),
                             Dimension::Type(unsigned(Dimension::BaseType::Unsigned) | int_type.getSize()))
                         );
@@ -116,6 +117,7 @@ void Hdf5Handler::initialize(
                             int_type.getOrder(),
                             int_type.getSign(),
                             int_type.getSize(),
+                            ctype.getSize(),
                             ctype.getMemberOffset(j),
                             Dimension::Type(unsigned(Dimension::BaseType::Signed) | int_type.getSize()))
                         );
@@ -130,6 +132,7 @@ void Hdf5Handler::initialize(
                         vauge_type,
                         float_type.getOrder(),
                         H5T_SGN_ERROR,
+                        ctype.getSize(),
                         float_type.getSize(),
                         ctype.getMemberOffset(j),
                         Dimension::Type(unsigned(Dimension::BaseType::Floating) | float_type.getSize()))

diff --git a/plugins/hdf/io/Hdf5Handler.hpp b/plugins/hdf/io/Hdf5Handler.hpp
@@ -66,14 +66,16 @@ namespace hdf5
             const H5T_class_t hdf_type,
             const H5T_order_t endianness,
             const H5T_sign_t sign,
-            const size_t size,
+            const size_t compound_size,
+            const size_t member_size,
             const int offset,
             Dimension::Type pdal_type)
             : name(name)
             , hdf_type(hdf_type)
             , endianness(endianness)
             , sign(sign)
-            , size(size)
+            , compound_size(compound_size)
+            , member_size(member_size)
             , offset(offset)
             , pdal_type(pdal_type)
         { }
@@ -82,7 +84,7 @@ namespace hdf5
         H5T_class_t hdf_type;
         H5T_order_t endianness;
         H5T_sign_t sign;
-        size_t size;
+        size_t member_size, compound_size;
         int offset;
         Dimension::Type pdal_type;
         Dimension::Id id;

diff --git a/plugins/hdf/io/HdfReader.cpp b/plugins/hdf/io/HdfReader.cpp
@@ -131,7 +131,7 @@ point_count_t HdfReader::read(PointViewPtr view, point_count_t count)
     //This could be a huge allocation.  Perhaps we should do something
     //  in the icebridge handler?
     std::cout << "HdfReader::read" << std::endl;
-    size_t point_size = 52; //TODO Fix
+    size_t point_size = m_infos.at(0).compound_size;
     PointId startId = view->size();
     point_count_t remaining = m_hdf5Handler.getNumPoints() - m_index;
     count = (std::min)(count, remaining);