Remove driver

qgis · Jun 21, 2013 · 6eadd80fcbb0f5ba598f4fffbe2b2216863fd0e9 · 6eadd80
1 parent 0b9d1dc
commit 6eadd80fcbb0f5ba598f4fffbe2b2216863fd0e9
Unified Split

Showing with 1 addition and 3 deletions.

+1 −2 src/providers/ogr/qgsogrfeatureiterator.cpp

+0 −1 src/providers/ogr/qgsogrfeatureiterator.h
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -35,7 +35,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrProvider* p, const QgsFeatur
   : QgsAbstractFeatureIterator( request ), P( p ), ogrDataSource(0), ogrLayer(0), ogrDriver(0)
 {
 
-  ogrDataSource = OGROpen( TO8F( P->filePath() ), false, &ogrDriver );
+  ogrDataSource = OGROpen( TO8F( P->filePath() ), false, NULL );
 
   if ( P->layerName().isNull() )
   {
@@ -150,7 +150,6 @@ bool QgsOgrFeatureIterator::close()
   if ( mClosed )
     return false;
 
-  OGR_DS_ReleaseResultSet( ogrDataSource, ogrLayer );
   OGR_DS_Destroy( ogrDataSource );
 
   mClosed = true;

diff --git a/src/providers/ogr/qgsogrfeatureiterator.h b/src/providers/ogr/qgsogrfeatureiterator.h
@@ -51,7 +51,6 @@ class QgsOgrFeatureIterator : public QgsAbstractFeatureIterator
 
     OGRDataSourceH ogrDataSource;
     OGRLayerH ogrLayer;
-    OGRSFDriverH ogrDriver;
 };