Merge remote-tracking branch 'origin/master'

PDAL · Apr 23, 2018 · 88c4f81 · 88c4f81
2 parents 545a440 + 98035cc
commit 88c4f81
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 16 deletions.
diff --git a/doc/stages/filters.delaunay.rst b/doc/stages/filters.delaunay.rst
@@ -15,7 +15,7 @@ dimensions of the point cloud.
 
 .. _Geogram: http://alice.loria.fr/software/geogram/doc/html/index.html
 
-.. embed::
+.. plugin::
 
 Example
 -------

diff --git a/filters/ReprojectionFilter.cpp b/filters/ReprojectionFilter.cpp
@@ -62,7 +62,6 @@ ReprojectionFilter::ReprojectionFilter()
     , m_in_ref_ptr(NULL)
     , m_out_ref_ptr(NULL)
     , m_transform_ptr(NULL)
-    , m_errorHandler(new gdal::ErrorHandler())
 {}
 
 

diff --git a/filters/ReprojectionFilter.hpp b/filters/ReprojectionFilter.hpp
@@ -42,11 +42,6 @@
 namespace pdal
 {
 
-namespace gdal
-{
-    class ErrorHandler;
-}
-
 class PDAL_DLL ReprojectionFilter : public Filter, public Streamable
 {
 public:
@@ -74,7 +69,6 @@ class PDAL_DLL ReprojectionFilter : public Filter, public Streamable
     ReferencePtr m_in_ref_ptr;
     ReferencePtr m_out_ref_ptr;
     TransformPtr m_transform_ptr;
-    gdal::ErrorHandler* m_errorHandler;
 
     ReprojectionFilter& operator=(const ReprojectionFilter&); // not implemented
     ReprojectionFilter(const ReprojectionFilter&); // not implemented

diff --git a/io/GeotiffSupport.cpp b/io/GeotiffSupport.cpp
@@ -45,6 +45,7 @@ PDAL_C_START
 // aren't exported.
 char PDAL_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*);
 int PDAL_DLL GTIFSetFromOGISDefn(GTIF*, const char*);
+void VSIFree(void *data);
 
 PDAL_C_END
 
@@ -146,7 +147,10 @@ GeotiffSrs::GeotiffSrs(const std::vector<uint8_t>& directoryRec,
     {
         char *wkt = GTIFGetOGISDefn(ctx.gtiff, &sGTIFDefn);
         if (wkt)
+        {
             m_srs.set(wkt);
+            VSIFree(wkt);
+        }
     }
 }
 

diff --git a/io/LasWriter.hpp b/io/LasWriter.hpp
@@ -102,7 +102,7 @@ class PDAL_DLL LasWriter : public FlexWriter, public Streamable
     std::string m_curFilename;
     StringList m_forwardSpec;
     std::set<std::string> m_forwards;
-    bool m_forwardVlrs;
+    bool m_forwardVlrs = false;
     LasCompression m_compression;
     std::vector<char> m_pointBuf;
     SpatialReference m_aSrs;

diff --git a/pdal/PointView.hpp b/pdal/PointView.hpp
@@ -212,6 +212,8 @@ class PDAL_DLL PointView : public PointContainer
         { return layout()->dimTypes(); }
     inline PointLayoutPtr layout() const
         { return m_pointTable.layout(); }
+    inline PointTableRef table() const
+        { return m_pointTable;}
     SpatialReference spatialReference() const
         { return m_spatialReference; }
 

diff --git a/pdal/XMLSchema.cpp b/pdal/XMLSchema.cpp
@@ -427,8 +427,8 @@ bool XMLSchema::load(xmlDocPtr doc)
                 xmlChar* n = xmlGetProp(properties, (const xmlChar*) "value");
                 if (!n)
                 {
-                    return false;
                     std::cerr << "Unable to fetch minimum value.\n";
+                    return false;
                 }
                 dim.m_min = std::atof((const char*)n);
                 xmlFree(n);

diff --git a/plugins/matlab/filters/Script.cpp b/plugins/matlab/filters/Script.cpp
@@ -125,8 +125,6 @@ PointLayoutPtr Script::getStructLayout(mxArray* array, LogPtr log)
             mt == mxINT16_CLASS  ||
             mt == mxUINT16_CLASS ||
             mt == mxINT32_CLASS  ||
-            mt == mxDOUBLE_CLASS ||
-            mt == mxINT32_CLASS  ||
             mt == mxUINT32_CLASS ||
             mt == mxINT64_CLASS  ||
             mt == mxUINT64_CLASS )

diff --git a/test/unit/filters/FerryFilterTest.cpp b/test/unit/filters/FerryFilterTest.cpp
@@ -120,7 +120,9 @@ TEST(FerryFilterTest, test_ferry_copy_json)
     double y = view->getFieldAs<double>(state_plane_y, 0);
 
     EXPECT_DOUBLE_EQ(-117.2501328350574, lon);
-    EXPECT_DOUBLE_EQ(49.341077824192915, lat);
+    // proj 5 will consider +ellps=GRS80 +towgs84=0,0,0 to be slighly different
+    // than +datum=WGS84 and return 49.341077823260804.
+    EXPECT_NEAR(49.341077824192915, lat, 1e-9);
     EXPECT_DOUBLE_EQ(637012.24, x);
     EXPECT_DOUBLE_EQ(849028.31, y);
 }

diff --git a/test/unit/filters/ReprojectionFilterTest.cpp b/test/unit/filters/ReprojectionFilterTest.cpp
@@ -66,6 +66,9 @@ TEST(ReprojectionFilterTest, ReprojectionFilterTest_test_1)
 
     const double postX = -93.351563;
     const double postY = 41.577148;
+    // proj 4 transformed to 16 exactly, but proj 5 will consider
+    // +ellps=GRS80 +towgs84=0,0,0 to be slighly different than +datum=WGS84
+    // and return 15.999954
     const double postZ = 16.000000;
 
     {
@@ -93,7 +96,7 @@ TEST(ReprojectionFilterTest, ReprojectionFilterTest_test_1)
 
         EXPECT_FLOAT_EQ(x, postX);
         EXPECT_FLOAT_EQ(y, postY);
-        EXPECT_FLOAT_EQ(z, postZ);
+        EXPECT_NEAR(z, postZ, 5e-5);
     }
 }
 
@@ -120,13 +123,16 @@ TEST(ReprojectionFilterTest, stream_test_1)
         static int i = 0;
         const double x = -93.351563;
         const double y = 41.577148;
+        // proj 4 transformed to 16 exactly, but proj 5 will consider
+        // +ellps=GRS80 +towgs84=0,0,0 to be slighly different than +datum=WGS84
+        // and return 15.999954
         const double z = 16.000000;
 
         if (i == 0)
         {
             EXPECT_FLOAT_EQ(point.getFieldAs<float>(Dimension::Id::X), x);
             EXPECT_FLOAT_EQ(point.getFieldAs<float>(Dimension::Id::Y), y);
-            EXPECT_FLOAT_EQ(point.getFieldAs<float>(Dimension::Id::Z), z);
+            EXPECT_NEAR(point.getFieldAs<float>(Dimension::Id::Z), z, 5e-5);
         }
         ++i;
         return true;

diff --git a/tools/lasdump/Vlr.hpp b/tools/lasdump/Vlr.hpp
@@ -47,7 +47,7 @@ class Vlr
 {
 public:
     bool matches(std::string userId, uint16_t recordId)
-        { return userId == userId && recordId == m_recordId; }
+        { return userId == m_userId && recordId == m_recordId; }
     const char *data() const
         { return (const char *)m_data.data(); }
     uint64_t dataLen() const