Changeset 11531

Timestamp:

05/15/07 22:37:55 (1 year ago)

Author:

warmerdam

Message:

clean up dataset/datasources that will be lost after exception (#1635)

Files:

• branches/1.4/gdal/swig/include/gdal.i (modified) (2 diffs)
• branches/1.4/gdal/swig/include/ogr.i (modified) (2 diffs)

branches/1.4/gdal/swig/include/gdal.i

@@ -579 +579 @@
-%inline %{
-GDALDatasetShadow* Open( char const* name, GDALAccess eAccess = GA_ReadOnly ) {
+  CPLErrorReset();
-  GDALDatasetShadow *ds = GDALOpen( name, eAccess );
+  if( ds != NULL && CPLGetLastErrorType() == CE_Failure )
+  {
+      if ( GDALDereferenceDataset( ds ) <= 0 )
+          GDALClose(ds);
+      ds = NULL;
+  }
-  return (GDALDatasetShadow*) ds;
-}
@@ -587 +594 @@
-%inline %{
-GDALDatasetShadow* OpenShared( char const* name, GDALAccess eAccess = GA_ReadOnly ) {
+  CPLErrorReset();
-  GDALDatasetShadow *ds = GDALOpenShared( name, eAccess );
+  if( ds != NULL && CPLGetLastErrorType() == CE_Failure )
+  {
+      if ( GDALDereferenceDataset( ds ) <= 0 )
+          GDALClose(ds);
+      ds = NULL;
+  }
-  return (GDALDatasetShadow*) ds;
-}

branches/1.4/gdal/swig/include/ogr.i

@@ -1448 +1448 @@
-%inline %{
-  OGRDataSourceShadow* Open( const char *filename, int update =0 ) {
+    CPLErrorReset();
-    OGRDataSourceShadow* ds = (OGRDataSourceShadow*)OGROpen(filename,update,NULL);
+    if( CPLGetLastErrorType() == CE_Failure && ds != NULL )
+    {
+        OGRReleaseDataSource(ds);
+        ds = NULL;
+    }
+        
-    return ds;
-  }
@@ -1457 +1464 @@
-%inline %{
-  OGRDataSourceShadow* OpenShared( const char *filename, int update =0 ) {
+    CPLErrorReset();
-    OGRDataSourceShadow* ds = (OGRDataSourceShadow*)OGROpenShared(filename,update,NULL);
+    if( CPLGetLastErrorType() == CE_Failure && ds != NULL )
+    {
+        OGRReleaseDataSource(ds);
+        ds = NULL;
+    }
+        
-    return ds;
-  }