gdal2.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

diff --git a/IO/GDAL/vtkGDALVectorReader.cxx b/IO/GDAL/vtkGDALVectorReader.cxx
index 86854a0..a0e234a 100644
--- a/IO/GDAL/vtkGDALVectorReader.cxx
+++ b/IO/GDAL/vtkGDALVectorReader.cxx
@@ -44,7 +44,7 @@ class vtkGDALVectorReader::Internal
 public:
   Internal( const char* srcName, int srcMode, int appendFeatures, int addFeatIds )
     {
-    this->Source = OGRSFDriverRegistrar::Open( srcName, srcMode, &this->Driver );
+    this->Source = (GDALDataset*) OGROpen( srcName, srcMode, NULL );
     if ( ! this->Source )
       {
       this->LastError = CPLGetLastErrorMsg();
@@ -61,7 +61,7 @@ public:
     {
     if ( this->Source )
       {
-      OGRDataSource::DestroyDataSource( this->Source );
+      GDALClose( (GDALDatasetH) this->Source );
       }
     }

@@ -304,7 +304,7 @@ public:
     return nCells;
     }

-  OGRDataSource* Source;
+  GDALDataset* Source;
   OGRSFDriver* Driver;
   const char* LastError;
   int LayerIdx;