Merge PDAL/PDAL into tindex-threaded

ibell13 · Oct 9, 2024 · e725d73 · e725d73
2 parents b661e6e + 9c86ef2
commit e725d73
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/io/CopcReader.cpp b/io/CopcReader.cpp
@@ -34,9 +34,10 @@
 
 #include "CopcReader.hpp"
 
+#include <algorithm>
+#include <atomic>
 #include <functional>
 #include <limits>
-#include <algorithm>
 
 #include <nlohmann/json.hpp>
 
@@ -413,8 +414,7 @@ void CopcReader::initialize(PointTableRef table)
         0;
 
     if (m_args->resolution)
-        log()->get(LogLevel::Debug) << "Maximum depth: " << m_p->depthEnd << 
-            std::endl;
+        log()->get(LogLevel::Debug) << "Maximum depth: " << m_p->depthEnd << std::endl;
 }
 
 

diff --git a/pdal/PipelineManager.cpp b/pdal/PipelineManager.cpp
@@ -229,7 +229,7 @@ PipelineManager::ExecResult PipelineManager::execute(ExecMode mode)
     Stage *s = getStage();
     if (!s)
         return result;
-                
+
     if (mode == ExecMode::PreferStream)
     {
         // If a pipeline isn't streamable before being prepared, it's not
@@ -530,7 +530,6 @@ void PipelineManager::replace(Stage *sOld, Stage *sNew)
     }
 }
 
-
 void PipelineManager::destroyStage(Stage *s)
 {
     if (s)
@@ -540,4 +539,11 @@ void PipelineManager::destroyStage(Stage *s)
 }
 
 
+// Set allowed dimensions on both tables since we don't know which one we're going to use.
+void PipelineManager::setAllowedDims(const StringList& dimNames)
+{
+    m_table.layout()->setAllowedDims(dimNames);
+    m_streamTable.layout()->setAllowedDims(dimNames);
+}
+
 } // namespace pdal
diff --git a/pdal/PipelineManager.hpp b/pdal/PipelineManager.hpp
@@ -152,6 +152,7 @@ class PDAL_DLL PipelineManager
     const std::vector<Stage *> stages() const
         { return m_stages; }
     void destroyStage(Stage *s = nullptr);
+    void setAllowedDims(const StringList& dimNames);
 
 private:
     void setOptions(Stage& stage, const Options& addOps);