Remove GDAL 2.1 cruft. (PDAL#2672)

Don't include GDALUtils in headers.

Author: abellgithub

filters/ColorinterpFilter.cpp

@@ -34,14 +34,10 @@
 
 #include "ColorinterpFilter.hpp"
 
-#include <pdal/PointView.hpp>
 #include <pdal/GDALUtils.hpp>
+#include <pdal/PointView.hpp>
 #include <pdal/util/ProgramArgs.hpp>
 
-#include <gdal.h>
-#include <cpl_vsi.h>
-#include <ogr_spatialref.h>
-
 #include <array>
 #include <algorithm>
 #include <cmath>
@@ -77,7 +73,7 @@ std::string ColorinterpFilter::getName() const { return s_info.name; }
 #define GETRAMP(name) \
     if (pdal::Utils::iequals(#name, rampFilename)) \
     { \
-        GByte* location(0); \
+        unsigned char* location(name); \
         int size (0); \
         location = name; \
         size = sizeof(name); \

filters/ColorinterpFilter.hpp

@@ -38,15 +38,13 @@
 #include <pdal/Streamable.hpp>
 #include <filters/StatsFilter.hpp>
 
-#include <gdal.h>
-#include <ogr_spatialref.h>
-#include <pdal/GDALUtils.hpp>
-
 #include <map>
 
 namespace pdal
 {
 
+namespace gdal { class Raster; }
+
 // Interpolates color ramp into Red, Green, and Blue dimensions
 // for a given dimension
 // specified dimensions. It also supports scaling the data by a multiplier
@@ -84,7 +82,7 @@ class PDAL_DLL ColorinterpFilter : public Filter, public Streamable
     double m_min;
     double m_max;
     std::string m_colorramp;
-    std::shared_ptr<pdal::gdal::Raster> m_raster;
+    std::shared_ptr<gdal::Raster> m_raster;
     std::string m_rampFilename;
     std::vector<uint8_t> m_redBand;
     std::vector<uint8_t> m_greenBand;

filters/ColorizationFilter.cpp

@@ -34,12 +34,10 @@
 
 #include "ColorizationFilter.hpp"
 
+#include <pdal/GDALUtils.hpp>
 #include <pdal/PointView.hpp>
 #include <pdal/util/ProgramArgs.hpp>
 
-#include <gdal.h>
-#include <ogr_spatialref.h>
-
 #include <array>
 
 namespace pdal

filters/ColorizationFilter.hpp

@@ -37,15 +37,13 @@
 #include <pdal/Filter.hpp>
 #include <pdal/Streamable.hpp>
 
-#include <gdal.h>
-#include <ogr_spatialref.h>
-#include <pdal/GDALUtils.hpp>
-
 #include <map>
 
 namespace pdal
 {
 
+namespace gdal { class Raster; }
+
 // Provides GDAL-based raster overlay that places output data in
 // specified dimensions. It also supports scaling the data by a multiplier
 // on a per-dimension basis.

filters/CropFilter.cpp

@@ -34,12 +34,12 @@
 
 #include "CropFilter.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 <pdal/GDALUtils.hpp>
 
 #include "private/Point.hpp"
 #include "private/pnp/GridPnp.hpp"

filters/DEMFilter.cpp

@@ -34,10 +34,12 @@
 
 #include "DEMFilter.hpp"
 
-#include "private/DimRange.hpp"
 #include <string>
 #include <vector>
 
+#include <pdal/GDALUtils.hpp>
+#include "private/DimRange.hpp"
+
 namespace pdal
 {
 

filters/DEMFilter.hpp

@@ -35,10 +35,8 @@
 #pragma once
 
 #include <pdal/Filter.hpp>
-#include <pdal/GDALUtils.hpp>
 #include <pdal/Streamable.hpp>
 
-
 #include <cstdint>
 #include <memory>
 #include <string>
@@ -48,6 +46,7 @@ namespace pdal
 
 struct DEMArgs;
 
+namespace gdal { class Raster; }
 class Options;
 class PointLayout;
 class PointView;

filters/OverlayFilter.cpp

@@ -36,8 +36,8 @@
 
 #include <vector>
 
-#include <pdal/GDALUtils.hpp>
 #include <pdal/QuadIndex.hpp>
+#include <pdal/GDALUtils.hpp>
 #include <pdal/util/ProgramArgs.hpp>
 
 namespace pdal

io/GDALReader.cpp

@@ -226,5 +226,11 @@ bool GDALReader::processOne(PointRef& point)
     return true;
 }
 
+
+void GDALReader::done(PointTableRef table)
+{
+    m_raster->close();
+}
+
 } // namespace pdal
 

io/GDALReader.hpp

@@ -40,12 +40,13 @@
 #include <pdal/Dimension.hpp>
 #include <pdal/Reader.hpp>
 #include <pdal/StageFactory.hpp>
-#include <pdal/GDALUtils.hpp>
 #include <pdal/Streamable.hpp>
 
 namespace pdal
 {
 
+namespace gdal { class Raster; }
+
 typedef std::map<std::string, Dimension::Id> DimensionMap;
 
 class PDAL_DLL GDALReader : public Reader , public Streamable
@@ -61,8 +62,7 @@ class PDAL_DLL GDALReader : public Reader , public Streamable
     virtual void addDimensions(PointLayoutPtr layout);
     virtual void ready(PointTableRef table);
     virtual point_count_t read(PointViewPtr view, point_count_t num);
-    virtual void done(PointTableRef table)
-        { m_raster->close(); }
+    virtual void done(PointTableRef table);
     virtual bool processOne(PointRef& point);
     virtual QuickInfo inspect();
     virtual void addArgs(ProgramArgs& args);