Merge remote-tracking branch 'origin/master'

PDAL · May 2, 2019 · d865c04 · d865c04
2 parents 19d73a4 + b757697
commit d865c04
Show file tree

Hide file tree

Showing 27 changed files with 192 additions and 338 deletions.
diff --git a/filters/ChipperFilter.cpp b/filters/ChipperFilter.cpp
@@ -91,6 +91,15 @@ PointViewSet ChipperFilter::run(PointViewPtr view)
         return m_outViews;
 
     m_inView = view;
+    m_partitions.resize(0);
+    m_xvec.resize(0);
+    m_yvec.resize(0);
+    m_spare.resize(view->size());
+    m_outViews.clear();
+
+    m_xvec.reserve(view->size());
+    m_yvec.reserve(view->size());
+
     load(*view.get(), m_xvec, m_yvec, m_spare);
     partition(m_xvec.size());
     decideSplit(m_xvec, m_yvec, m_spare, 0, m_partitions.size() - 1);
@@ -101,13 +110,6 @@ PointViewSet ChipperFilter::run(PointViewPtr view)
 void ChipperFilter::load(PointView& view, ChipRefList& xvec, ChipRefList& yvec,
     ChipRefList& spare)
 {
-    point_count_t idx;
-    std::vector<ChipPtRef>::iterator it;
-
-    xvec.reserve(view.size());
-    yvec.reserve(view.size());
-    spare.resize(view.size());
-
     for (PointId i = 0; i < view.size(); ++i)
     {
         ChipPtRef xref;
@@ -127,7 +129,7 @@ void ChipperFilter::load(PointView& view, ChipRefList& xvec, ChipRefList& yvec,
     std::stable_sort(xvec.begin(), xvec.end());
     for (size_t i = 0; i < xvec.size(); ++i)
     {
-        idx = xvec[i].m_ptindex;
+        point_count_t idx = xvec[i].m_ptindex;
         yvec[idx].m_oindex = i;
     }
 
@@ -140,8 +142,6 @@ void ChipperFilter::load(PointView& view, ChipRefList& xvec, ChipRefList& yvec,
 }
 
 
-
-
 #ifdef _WIN32
 inline long lround(double d)
 {

diff --git a/filters/CropFilter.cpp b/filters/CropFilter.cpp
@@ -34,11 +34,11 @@
 
 #include "CropFilter.hpp"
 
-#include <pdal/Bounds.hpp>
 #include <pdal/GDALUtils.hpp>
 #include <pdal/PointView.hpp>
 #include <pdal/StageFactory.hpp>
 #include <pdal/Polygon.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/util/ProgramArgs.hpp>
 
 #include "private/Point.hpp"

diff --git a/io/EptReader.hpp b/io/EptReader.hpp
@@ -41,9 +41,9 @@
 #include <mutex>
 #include <set>
 
-#include <pdal/Bounds.hpp>
 #include <pdal/Reader.hpp>
 #include <pdal/Streamable.hpp>
+#include <pdal/util/Bounds.hpp>
 
 #include <nlohmann/json.hpp>
 

diff --git a/io/GDALWriter.hpp b/io/GDALWriter.hpp
@@ -34,10 +34,10 @@
 
 #include <algorithm>
 
-#include <pdal/Bounds.hpp>
 #include <pdal/FlexWriter.hpp>
 #include <pdal/PointView.hpp>
 #include <pdal/Streamable.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/util/ProgramArgs.hpp>
 
 namespace pdal

diff --git a/io/LasHeader.hpp b/io/LasHeader.hpp
@@ -40,7 +40,7 @@
 
 #include <pdal/Dimension.hpp>
 #include <pdal/Log.hpp>
-#include <pdal/util/Box.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/util/Uuid.hpp>
 #include <pdal/pdal_config.hpp>
 #include <pdal/gitsha.h>

diff --git a/io/private/EptSupport.hpp b/io/private/EptSupport.hpp
@@ -52,7 +52,7 @@
 #include <pdal/PointLayout.hpp>
 #include <pdal/PointTable.hpp>
 #include <pdal/Stage.hpp>
-#include <pdal/util/Box.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/util/Utils.hpp>
 
 #include <arbiter/arbiter.hpp>

diff --git a/pdal/Bounds.cpp b/pdal/Bounds.cpp
diff --git a/pdal/Bounds.hpp b/pdal/Bounds.hpp
diff --git a/pdal/EigenUtils.cpp b/pdal/EigenUtils.cpp
@@ -37,7 +37,7 @@
 #include <pdal/KDIndex.hpp>
 #include <pdal/PointView.hpp>
 #include <pdal/SpatialReference.hpp>
-#include <pdal/util/Box.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/util/Utils.hpp>
 
 #include <Eigen/Dense>

diff --git a/pdal/GDALUtils.hpp b/pdal/GDALUtils.hpp
@@ -44,7 +44,7 @@
 #include <pdal/Dimension.hpp>
 #include <pdal/Log.hpp>
 #include <pdal/SpatialReference.hpp>
-#include <pdal/util/Box.hpp>
+#include <pdal/util/Bounds.hpp>
 
 #include <cpl_conv.h>
 #include <gdal_priv.h>

diff --git a/pdal/Metadata.cpp b/pdal/Metadata.cpp
@@ -34,7 +34,7 @@
 
 #include <pdal/Metadata.hpp>
 #include <pdal/SpatialReference.hpp>
-#include <pdal/util/Box.hpp>
+#include <pdal/util/Bounds.hpp>
 
 namespace pdal
 {

diff --git a/pdal/Metadata.hpp b/pdal/Metadata.hpp
@@ -36,7 +36,7 @@
 
 #include <pdal/pdal_internal.hpp>
 
-#include <pdal/util/Box.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/util/Utils.hpp>
 #include <pdal/util/Uuid.hpp>
 

diff --git a/pdal/PDALUtils.hpp b/pdal/PDALUtils.hpp
@@ -37,7 +37,7 @@
 #include <pdal/Metadata.hpp>
 #include <pdal/Dimension.hpp>
 #include <pdal/pdal_export.hpp>
-#include <pdal/util/Box.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/util/Inserter.hpp>
 #include <pdal/util/Extractor.hpp>
 

diff --git a/pdal/QuadIndex.hpp b/pdal/QuadIndex.hpp
@@ -38,7 +38,7 @@
 #include <memory>
 
 #include <pdal/pdal_types.hpp>
-#include <pdal/util/Box.hpp>
+#include <pdal/util/Bounds.hpp>
 
 namespace pdal
 {

diff --git a/pdal/QuickInfo.hpp b/pdal/QuickInfo.hpp
@@ -36,7 +36,7 @@
 
 #include <vector>
 
-#include <pdal/util/Box.hpp>
+#include <pdal/util/Bounds.hpp>
 #include <pdal/SpatialReference.hpp>
 
 namespace pdal