Merge remote-tracking branch 'origin/master' into issue-3387

PDAL · May 14, 2021 · a91f7a5 · a91f7a5
2 parents 01379e7 + b172d83
commit a91f7a5
Show file tree

Hide file tree

Showing 14 changed files with 142 additions and 880 deletions.
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -13,7 +13,7 @@ jobs:
         platform: ['ubuntu-latest','windows-latest','macos-latest']
 
     env:
-      PLATFORM: ${{ matrix.platform }}
+      PDAL_PLATFORM: ${{ matrix.platform }}
 
     steps:
     - uses: actions/checkout@v2

diff --git a/filters/FarthestPointSamplingFilter.cpp b/filters/FarthestPointSamplingFilter.cpp
@@ -72,9 +72,16 @@ PointViewSet FarthestPointSamplingFilter::run(PointViewPtr inView)
 {
     // Return empty PointViewSet if the input PointView has no points.
     PointViewSet viewSet;
-    if (!inView->size() || (inView->size() < m_count))
+    if (!inView->size())
         return viewSet;
 
+    // Return inView if input PointView has fewer than count points.
+    if (inView->size() < m_count)
+    {
+        viewSet.insert(inView);
+        return viewSet;
+    }
+
     PointIdList ids = Segmentation::farthestPointSampling(*inView, m_count);
 
     PointViewPtr outView = inView->makeNew();

diff --git a/filters/HeadFilter.cpp b/filters/HeadFilter.cpp
@@ -81,17 +81,18 @@ bool HeadFilter::processOne(PointRef& point)
 
 PointViewSet HeadFilter::run(PointViewPtr inView)
 {
+    m_index = 0;
+
     PointViewSet viewSet;
     if (!inView->size())
         return viewSet;
 
     PointViewPtr outView = inView->makeNew();
 
-    for (PointId i = 0; i < inView->size(); ++i)
+    for (PointRef point : *inView)
     {
-        PointRef point = inView->point(i);
         if (processOne(point))
-            outView->appendPoint(*inView, i);
+            outView->appendPoint(*inView, point.pointId());
     }
 
     viewSet.insert(outView);

diff --git a/plugins/teaser/filters/TeaserFilter.cpp b/plugins/teaser/filters/TeaserFilter.cpp
@@ -44,7 +44,7 @@
 #include <Eigen/Dense>
 
 #include <teaser/matcher.h>
-#include "registration.h"
+#include <teaser/registration.h>
 
 #include <numeric>
 

diff --git a/plugins/teaser/filters/TeaserFilter.hpp b/plugins/teaser/filters/TeaserFilter.hpp
@@ -41,6 +41,16 @@
 namespace pdal
 {
 
+// To enable compilation with C++11, we can implement the workaround documented
+// at https://stackoverflow.com/a/17903225/1620549 to provide support for
+// std::make_unique.
+template<typename T, typename... Args>
+std::unique_ptr<T> make_unique(Args&&... args)
+{
+    return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+
+
 class PDAL_DLL TeaserFilter : public Filter
 {
 public: