Merge commit '8be9a8c057b7939f37141bbb2a584fa7e4243c45' into working

hobuinc · Nov 17, 2020 · f0ace81 · f0ace81
2 parents 4b2e9d2 + 8be9a8c
commit f0ace81
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/epf/Epf.cpp b/epf/Epf.cpp
@@ -203,6 +203,7 @@ void Epf::run(const std::vector<std::string>& options)
     }
     m_pool.stop();
     m_writer->stop();
+
     writeMetadata(m_outputDir, m_grid,
         m_srsFileInfo.valid() ? m_srsFileInfo.srs.getWKT() : "NONE", layout);
 }

diff --git a/epf/Writer.cpp b/epf/Writer.cpp
@@ -26,12 +26,6 @@ namespace ept2
 namespace epf
 {
 
-struct WriteData
-{
-    VoxelKey key;
-    DataVecPtr data;
-};
-
 Writer::Writer(const std::string& directory, int numThreads) :
     m_directory(directory), m_pool(numThreads), m_stop(false)
 {

diff --git a/epf/Writer.hpp b/epf/Writer.hpp
@@ -35,7 +35,7 @@ class Writer
     struct WriteData
     {
         VoxelKey key;
-        std::unique_ptr<std::vector<uint8_t>> data;
+        DataVecPtr data;
     };
 
 public: