Merge remote-tracking branch 'origin/master' into projfix

PDAL · Jun 3, 2019 · 57d9aee · 57d9aee
2 parents a08bab7 + 31d5003
commit 57d9aee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/filters/private/hexer/Path.cpp b/filters/private/hexer/Path.cpp
@@ -36,6 +36,8 @@
 
 #include "Path.hpp"
 
+#include <cassert>
+
 using namespace std;
 
 namespace hexer
@@ -89,7 +91,7 @@ void Path::writeRing(std::ostream& out) const
 
 // WKT (or GeoJSON) doesn't allow nesting of polygons.  You can just have
 // polygons and holes.  Islands within the holes need to be described as
-// separate polygons.  To that end, we grather the islands from all holes
+// separate polygons.  To that end, we gather the islands from all holes
 // and return them to be processed as separate polygons.
 PathPtrList Path::writePolygon(std::ostream& out) const
 {

diff --git a/test/unit/filters/HexbinFilterTest.cpp b/test/unit/filters/HexbinFilterTest.cpp
@@ -103,8 +103,8 @@ TEST(HexbinFilterTest, issue_2507)
 
     // This is an arrangement with two holes.  One of the holes has two
     // islands and one of those islands has a hole.
-    // Here's a link to the picture.  the green numbers represent the hexes
-    // represented:
+    // Here's a link to the picture.  The green numbers indicate the hexes
+    // listed here:
     // https://photos.app.goo.gl/P3B3mU4Zre6zADEQ6
     std::vector<std::pair<int, int>> hexes {
         {0, 3}, {0, 4}, {0,5}, {0, 6},