another attempt and organizing GDAL debug

PDAL · Oct 23, 2012 · a80e529 · a80e529
1 parent f68a46f
commit a80e529
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/include/pdal/filters/InPlaceReprojection.hpp b/include/pdal/filters/InPlaceReprojection.hpp
@@ -68,6 +68,7 @@ class PDAL_DLL InPlaceReprojection : public Filter
                         const SpatialReference& inSRS,
                         const SpatialReference& outSRS);
 
+    ~InPlaceReprojection();
     virtual void initialize();
     virtual const Options getDefaultOptions() const;
 
@@ -133,7 +134,7 @@ class PDAL_DLL InPlaceReprojection : public Filter
     dimension::id m_old_y_id;
     dimension::id m_old_z_id;
 
-    boost::shared_ptr<pdal::gdal::Debug> m_gdal_debug;
+    pdal::gdal::Debug*  m_gdal_debug;
 
     InPlaceReprojection& operator=(const InPlaceReprojection&); // not implemented
     InPlaceReprojection(const InPlaceReprojection&); // not implemented

diff --git a/src/filters/Colorization.cpp b/src/filters/Colorization.cpp
@@ -76,7 +76,7 @@ Colorization::~Colorization()
 {
 #ifdef PDAL_HAVE_GDAL
 
-    if (m_gdal_debug)
+    if (m_gdal_debug != 0)
         delete m_gdal_debug;
 
     if (m_ds != 0)
@@ -99,7 +99,9 @@ void Colorization::initialize()
 #ifdef PDAL_HAVE_GDAL
 
     pdal::GlobalEnvironment::get().getGDALEnvironment();
-    m_gdal_debug = new pdal::gdal::Debug(isDebug(), log());
+
+    if (m_gdal_debug == 0)
+        m_gdal_debug = new pdal::gdal::Debug(isDebug(), log());
     m_forward_transform.assign(0.0);
     m_inverse_transform.assign(0.0);
 

diff --git a/src/filters/InPlaceReprojection.cpp b/src/filters/InPlaceReprojection.cpp
@@ -82,7 +82,8 @@ InPlaceReprojection::InPlaceReprojection(Stage& prevStage, const Options& option
     , m_new_z_id(boost::uuids::nil_uuid())
     , m_old_x_id(boost::uuids::nil_uuid())
     , m_old_y_id(boost::uuids::nil_uuid())
-    , m_old_z_id(boost::uuids::nil_uuid())    
+    , m_old_z_id(boost::uuids::nil_uuid())
+    , m_gdal_debug(0)
 {
     if (options.hasOption("in_srs"))
     {
@@ -97,7 +98,12 @@ InPlaceReprojection::InPlaceReprojection(Stage& prevStage, const Options& option
     return;
 }
 
-
+InPlaceReprojection::~InPlaceReprojection()
+{
+    if (m_gdal_debug != 0)
+        delete m_gdal_debug;
+
+}
 void InPlaceReprojection::initialize()
 {
     Filter::initialize();
@@ -108,8 +114,9 @@ void InPlaceReprojection::initialize()
     }
 
 #ifdef PDAL_HAVE_GDAL
-
-    m_gdal_debug = boost::shared_ptr<pdal::gdal::Debug>(new pdal::gdal::Debug(isDebug(), log()));
+
+    if (m_gdal_debug == 0)
+        m_gdal_debug = new pdal::gdal::Debug(isDebug(), log());
 
     m_in_ref_ptr = ReferencePtr(OSRNewSpatialReference(0), OGRSpatialReferenceDeleter());
     m_out_ref_ptr = ReferencePtr(OSRNewSpatialReference(0), OGRSpatialReferenceDeleter());