provide getGDALEnvironment to wake up GDAL on-demand for things that …

…need it while still preventing it from being tore down while others might still depend on it

include/pdal/GlobalEnvironment.hpp

@@ -65,6 +65,8 @@ class PDAL_DLL GlobalEnvironment
 
     // forwarded function
     boost::random::mt19937* getRNG();
+
+    void getGDALEnvironment();
 
 private:
     GlobalEnvironment();
@@ -73,9 +75,10 @@ class PDAL_DLL GlobalEnvironment
     static void init();
 
     typedef std::map<boost::thread::id, ThreadEnvironment*> thread_map;
-    thread_map m_threadMap;
 
+    thread_map m_threadMap;
     plang::PythonEnvironment* m_pythonEnvironment;
+    bool m_bIsGDALInitialized;
 
     GlobalEnvironment(const GlobalEnvironment&); // nope
     GlobalEnvironment& operator=(const GlobalEnvironment&); // nope

src/GlobalEnvironment.cpp

@@ -98,20 +98,27 @@ void GlobalEnvironment::init()
 //
 
 GlobalEnvironment::GlobalEnvironment()
-#ifdef PDAL_HAVE_PYTHON
 : m_pythonEnvironment(0)
-#endif
+, m_bIsGDALInitialized(false)
 {
     // this should be the not-a-thread thread environment
     (void) createThreadEnvironment(boost::thread::id());
 
-#ifdef PDAL_HAVE_GDAL
-    (void) GDALAllRegister();
-#endif
+
 
     return;
 }
 
+void GlobalEnvironment::getGDALEnvironment()
+{
+#ifdef PDAL_HAVE_GDAL
+    if (!m_bIsGDALInitialized)
+    {
+        (void) GDALAllRegister();
+        m_bIsGDALInitialized = true;        
+    }
+#endif    
+}
 
 GlobalEnvironment::~GlobalEnvironment()
 {
@@ -130,7 +137,11 @@ GlobalEnvironment::~GlobalEnvironment()
 #endif
 
 #ifdef PDAL_HAVE_GDAL
-    (void) GDALDestroyDriverManager();
+    if (m_bIsGDALInitialized)
+    {
+        (void) GDALDestroyDriverManager();
+        m_bIsGDALInitialized = false;
+    }
 #endif
 
     return;

src/filters/Colorization.cpp

@@ -39,6 +39,7 @@
 #include <algorithm>
 
 #include <pdal/PointBuffer.hpp>
+#include <pdal/GlobalEnvironment.hpp>
 
 #ifdef PDAL_HAVE_GDAL
 #include <gdal.h>
@@ -93,7 +94,8 @@ void Colorization::initialize()
     collectOptions();
 
 #ifdef PDAL_HAVE_GDAL
-
+
+    pdal::GlobalEnvironment::get().getGDALEnvironment();
     m_gdal_debug = new pdal::gdal::Debug(isDebug(), log());
     m_forward_transform.assign(0.0);
     m_inverse_transform.assign(0.0);