From 781aaef03a5ed00205417ae21c8904cbb286553d Mon Sep 17 00:00:00 2001
From: Andrew Bell <andrew.bell.ia@gmail.com>
Date: Thu, 25 Jun 2020 17:56:43 -0400
Subject: [PATCH] Move GDALUtils to private.

---
 apps/pdal.cpp                         | 2 +-
 filters/ColorinterpFilter.cpp         | 2 +-
 filters/CropFilter.cpp                | 2 +-
 filters/OverlayFilter.cpp             | 2 +-
 io/EptReader.cpp                      | 5 +++--
 io/OGRWriter.cpp                      | 2 +-
 io/TIndexReader.cpp                   | 2 +-
 kernels/DensityKernel.cpp             | 3 ---
 kernels/TIndexKernel.cpp              | 2 +-
 kernels/private/density/OGR.cpp       | 5 +++++
 kernels/private/density/OGR.hpp       | 7 ++-----
 pdal/Geometry.cpp                     | 3 ++-
 pdal/Polygon.cpp                      | 2 +-
 pdal/{ => private/gdal}/GDALUtils.cpp | 0
 pdal/{ => private/gdal}/GDALUtils.hpp | 0
 pdal/private/gdal/Raster.cpp          | 2 +-
 plugins/nitf/io/NitfWriter.cpp        | 2 +-
 test/unit/filters/CropFilterTest.cpp  | 2 ++
 test/unit/io/EptReaderTest.cpp        | 3 ++-
 19 files changed, 26 insertions(+), 22 deletions(-)
 rename pdal/{ => private/gdal}/GDALUtils.cpp (100%)
 rename pdal/{ => private/gdal}/GDALUtils.hpp (100%)

diff --git a/apps/pdal.cpp b/apps/pdal.cpp
index 7075b7a1c6..454dd6032d 100644
--- a/apps/pdal.cpp
+++ b/apps/pdal.cpp
@@ -33,12 +33,12 @@
 * OF SUCH DAMAGE.
 ****************************************************************************/
 
-#include <pdal/GDALUtils.hpp>
 #include <pdal/Kernel.hpp>
 #include <pdal/PluginManager.hpp>
 #include <pdal/StageFactory.hpp>
 #include <pdal/pdal_config.hpp>
 #include <pdal/util/Backtrace.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 
 #include <iomanip>
 #include <iostream>
diff --git a/filters/ColorinterpFilter.cpp b/filters/ColorinterpFilter.cpp
index 689d471274..aa06842ecf 100644
--- a/filters/ColorinterpFilter.cpp
+++ b/filters/ColorinterpFilter.cpp
@@ -34,10 +34,10 @@
 
 #include "ColorinterpFilter.hpp"
 
-#include <pdal/GDALUtils.hpp>
 #include <pdal/PointView.hpp>
 #include <pdal/util/ProgramArgs.hpp>
 #include <pdal/util/Utils.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 #include <pdal/private/gdal/Raster.hpp>
 
 #include <array>
diff --git a/filters/CropFilter.cpp b/filters/CropFilter.cpp
index 0e4eecbf5a..b61c1b441c 100644
--- a/filters/CropFilter.cpp
+++ b/filters/CropFilter.cpp
@@ -39,7 +39,7 @@
 #include <pdal/Polygon.hpp>
 #include <pdal/util/Bounds.hpp>
 #include <pdal/util/ProgramArgs.hpp>
-#include <pdal/GDALUtils.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 
 #include "private/Point.hpp"
 #include "private/pnp/GridPnp.hpp"
diff --git a/filters/OverlayFilter.cpp b/filters/OverlayFilter.cpp
index 725a40b195..c19f742923 100644
--- a/filters/OverlayFilter.cpp
+++ b/filters/OverlayFilter.cpp
@@ -38,8 +38,8 @@
 
 #include <ogr_api.h>
 
-#include <pdal/GDALUtils.hpp>
 #include <pdal/util/ProgramArgs.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 
 namespace pdal
 {
diff --git a/io/EptReader.cpp b/io/EptReader.cpp
index 15e266b6fc..4eb0bc11f4 100644
--- a/io/EptReader.cpp
+++ b/io/EptReader.cpp
@@ -36,12 +36,13 @@
 
 #include <limits>
 
+#include <nlohmann/json.hpp>
+
 #include <pdal/ArtifactManager.hpp>
-#include <pdal/GDALUtils.hpp>
 #include <pdal/Polygon.hpp>
 #include <pdal/SrsBounds.hpp>
 #include <pdal/pdal_features.hpp>
-#include <nlohmann/json.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 
 #include "private/ept/Connector.hpp"
 #include "private/ept/EptArtifact.hpp"
diff --git a/io/OGRWriter.cpp b/io/OGRWriter.cpp
index 4f6e0a1d3c..c615d097b1 100644
--- a/io/OGRWriter.cpp
+++ b/io/OGRWriter.cpp
@@ -38,7 +38,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #include <pdal/PointView.hpp>
-#include <pdal/GDALUtils.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 #include <pdal/util/FileUtils.hpp>
 #include <pdal/private/gdal/ErrorHandler.hpp>
 
diff --git a/io/TIndexReader.cpp b/io/TIndexReader.cpp
index 995d7d98d5..4e6fa44527 100644
--- a/io/TIndexReader.cpp
+++ b/io/TIndexReader.cpp
@@ -37,8 +37,8 @@
 #include <ogr_api.h>
 
 #include <pdal/Polygon.hpp>
-#include <pdal/GDALUtils.hpp>
 #include <pdal/util/ProgramArgs.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 #include <pdal/private/gdal/SpatialRef.hpp>
 
 namespace pdal
diff --git a/kernels/DensityKernel.cpp b/kernels/DensityKernel.cpp
index bdbb570261..6f0a467657 100644
--- a/kernels/DensityKernel.cpp
+++ b/kernels/DensityKernel.cpp
@@ -37,7 +37,6 @@
 #include "../filters/HexBinFilter.hpp"
 #include "private/density/OGR.hpp"
 
-#include <pdal/GDALUtils.hpp>
 #include <pdal/util/FileUtils.hpp>
 
 namespace pdal
@@ -88,8 +87,6 @@ void DensityKernel::outputDensity(pdal::SpatialReference const& reference)
 
 int DensityKernel::execute()
 {
-    gdal::registerDrivers();
-
     if (m_inputFile == "STDIN" ||
         (FileUtils::extension(m_inputFile) == ".xml" ||
         FileUtils::extension(m_inputFile) == ".json"))
diff --git a/kernels/TIndexKernel.cpp b/kernels/TIndexKernel.cpp
index 0254233208..917836d922 100644
--- a/kernels/TIndexKernel.cpp
+++ b/kernels/TIndexKernel.cpp
@@ -39,11 +39,11 @@
 
 #include <ogr_api.h>
 
-#include <pdal/GDALUtils.hpp>
 #include <pdal/PDALUtils.hpp>
 #include <pdal/Polygon.hpp>
 #include <pdal/StageFactory.hpp>
 #include <pdal/util/FileUtils.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 #include <pdal/private/gdal/SpatialRef.hpp>
 
 #include "../io/LasWriter.hpp"
diff --git a/kernels/private/density/OGR.cpp b/kernels/private/density/OGR.cpp
index 5ce2b82e26..595507fe31 100644
--- a/kernels/private/density/OGR.cpp
+++ b/kernels/private/density/OGR.cpp
@@ -38,7 +38,11 @@
 #include <sstream>
 #include <functional>
 
+#include <gdal.h>
+#include <ogr_api.h>
+
 #include <pdal/util/FileUtils.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 #include <pdal/private/gdal/SpatialRef.hpp>
 
 #include "../filters/private/hexer/HexGrid.hpp"
@@ -133,6 +137,7 @@ OGR::~OGR()
 
 void OGR::createLayer(const std::string& wkt)
 {
+    gdal::registerDrivers();
     OGRSFDriverH driver = OGRGetDriverByName(m_driver.c_str());
     if (driver == NULL)
     {
diff --git a/kernels/private/density/OGR.hpp b/kernels/private/density/OGR.hpp
index ed3f52dd36..5f96ca2727 100644
--- a/kernels/private/density/OGR.hpp
+++ b/kernels/private/density/OGR.hpp
@@ -35,11 +35,6 @@
 
 #include <string>
 
-#include <pdal/GDALUtils.hpp>
-
-#include "ogr_api.h"
-#include "gdal.h"
-
 namespace hexer
 {
     class HexGrid;
@@ -50,6 +45,8 @@ namespace pdal
 
 class OGR
 {
+    using OGRDataSourceH = void *;
+    using OGRLayerH = void *;
 
 public:
     OGR(std::string const& filename, const std::string& srs,
diff --git a/pdal/Geometry.cpp b/pdal/Geometry.cpp
index fbf95f217b..ab0d847db0 100644
--- a/pdal/Geometry.cpp
+++ b/pdal/Geometry.cpp
@@ -36,7 +36,8 @@
 #include <ogr_geometry.h>
 
 #include <pdal/Geometry.hpp>
-#include <pdal/GDALUtils.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
+
 #include "private/SrsTransform.hpp"
 
 namespace pdal
diff --git a/pdal/Polygon.cpp b/pdal/Polygon.cpp
index 1d0f5f9312..eca9891c05 100644
--- a/pdal/Polygon.cpp
+++ b/pdal/Polygon.cpp
@@ -35,8 +35,8 @@
 #include <ogr_api.h>
 #include <ogr_geometry.h>
 
-#include <pdal/GDALUtils.hpp>
 #include <pdal/Polygon.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 
 #include "../filters/private/pnp/GridPnp.hpp"
 
diff --git a/pdal/GDALUtils.cpp b/pdal/private/gdal/GDALUtils.cpp
similarity index 100%
rename from pdal/GDALUtils.cpp
rename to pdal/private/gdal/GDALUtils.cpp
diff --git a/pdal/GDALUtils.hpp b/pdal/private/gdal/GDALUtils.hpp
similarity index 100%
rename from pdal/GDALUtils.hpp
rename to pdal/private/gdal/GDALUtils.hpp
diff --git a/pdal/private/gdal/Raster.cpp b/pdal/private/gdal/Raster.cpp
index d5e3595c4c..0d0fc7d047 100644
--- a/pdal/private/gdal/Raster.cpp
+++ b/pdal/private/gdal/Raster.cpp
@@ -35,10 +35,10 @@
 #include <gdal.h>
 #include <gdal_priv.h>
 
-#include <pdal/GDALUtils.hpp>
 #include <pdal/util/Algorithm.hpp>
 
 #include "Raster.hpp"
+#include "GDALUtils.hpp"
 
 namespace pdal
 {
diff --git a/plugins/nitf/io/NitfWriter.cpp b/plugins/nitf/io/NitfWriter.cpp
index 1e5cc30947..10a3602232 100644
--- a/plugins/nitf/io/NitfWriter.cpp
+++ b/plugins/nitf/io/NitfWriter.cpp
@@ -37,8 +37,8 @@
 
 #include "NitfWriter.hpp"
 
-#include <pdal/GDALUtils.hpp>
 #include <pdal/PointView.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
 
 #ifndef IMPORT_NITRO_API
 #define IMPORT_NITRO_API
diff --git a/test/unit/filters/CropFilterTest.cpp b/test/unit/filters/CropFilterTest.cpp
index 3b515b7162..a318ae5572 100644
--- a/test/unit/filters/CropFilterTest.cpp
+++ b/test/unit/filters/CropFilterTest.cpp
@@ -47,8 +47,10 @@
 #include "Support.hpp"
 
 //ABELL
+/**
 #include <pdal/util/Bounds.hpp>
 #include <pdal/GDALUtils.hpp>
+**/
 
 using namespace pdal;
 
diff --git a/test/unit/io/EptReaderTest.cpp b/test/unit/io/EptReaderTest.cpp
index 5612be0512..35f533f759 100644
--- a/test/unit/io/EptReaderTest.cpp
+++ b/test/unit/io/EptReaderTest.cpp
@@ -42,9 +42,10 @@
 #include <io/LasReader.hpp>
 #include <filters/CropFilter.hpp>
 #include <filters/ReprojectionFilter.hpp>
-#include <pdal/GDALUtils.hpp>
 #include <pdal/SrsBounds.hpp>
 #include <pdal/util/FileUtils.hpp>
+#include <pdal/private/gdal/GDALUtils.hpp>
+
 #include "Support.hpp"
 
 namespace pdal