From 8dfea424c59f524df73ecf4b1492d55453bf2e89 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 28 Oct 2004 07:00:55 +0000
Subject: [PATCH] Removed gdal_priv.h from include/osgTerrain/DataSet to remove
 the external dependency on GDAL.

---
 include/osgTerrain/DataSet | 11 ++++-------
 src/osgTerrain/DataSet.cpp |  5 +++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/osgTerrain/DataSet b/include/osgTerrain/DataSet
index 3feb631a5..af0bba068 100644
--- a/include/osgTerrain/DataSet
+++ b/include/osgTerrain/DataSet
@@ -34,10 +34,11 @@
 
 #include <set>
 
-#include <gdal_priv.h>
-
 #include <osgTerrain/Export>
 
+// forward declare so we can avoid tieing osgTerrain to GDAL.
+class GDALDataset;
+
 namespace osgTerrain
 {
 
@@ -131,11 +132,7 @@ class OSGTERRAIN_EXPORT DataSet : public osg::Referenced
                 _hasGCPs(false),
                 _gdalDataSet(0) {}
                 
-                
-            virtual ~SourceData()
-            {
-                if (_gdalDataSet) GDALClose(_gdalDataSet);
-            }
+            virtual ~SourceData();
 
             static SourceData* readData(Source* source);
             
diff --git a/src/osgTerrain/DataSet.cpp b/src/osgTerrain/DataSet.cpp
index a28d86910..ff56a137d 100644
--- a/src/osgTerrain/DataSet.cpp
+++ b/src/osgTerrain/DataSet.cpp
@@ -206,6 +206,11 @@ bool areCoordinateSystemEquivalent(const osg::CoordinateSystemNode* lhs,const os
 	 return result ? true : false;
 }
 
+DataSet::SourceData::~SourceData()
+{
+    if (_gdalDataSet) GDALClose(_gdalDataSet);
+}
+
 DataSet::SourceData* DataSet::SourceData::readData(Source* source)
 {
     if (!source) return 0;