sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

vector file writer: defer destroying spatial reference (fixes #10515)

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-10-18 16:50:50 +02:00
parent 6426be343f
commit cee63c84f7
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/qgsvectorfilewriter.cpp
View File

@ -69,6 +69,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(
) )
: mDS( NULL ) : mDS( NULL )
, mLayer( NULL ) , mLayer( NULL )
, mOgrRef( NULL )
, mGeom( NULL ) , mGeom( NULL )
, mError( NoError ) , mError( NoError )
, mCodec( 0 ) , mCodec( 0 )
@ -260,12 +261,11 @@ QgsVectorFileWriter::QgsVectorFileWriter(
} }
// consider spatial reference system of the layer // consider spatial reference system of the layer
OGRSpatialReferenceH ogrRef = NULL;
if ( srs ) if ( srs )
{ {
QString srsWkt = srs->toWkt(); QString srsWkt = srs->toWkt();
QgsDebugMsg( "WKT to save as is " + srsWkt ); QgsDebugMsg( "WKT to save as is " + srsWkt );
ogrRef = OSRNewSpatialReference( srsWkt.toLocal8Bit().data() ); mOgrRef = OSRNewSpatialReference( srsWkt.toLocal8Bit().data() );
} }
// datasource created, now create the output layer // datasource created, now create the output layer
@ -285,7 +285,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(
// disable encoding conversion of OGR Shapefile layer // disable encoding conversion of OGR Shapefile layer
CPLSetConfigOption( "SHAPE_ENCODING", "" ); CPLSetConfigOption( "SHAPE_ENCODING", "" );
mLayer = OGR_DS_CreateLayer( mDS, TO8F( layerName ), ogrRef, wkbType, options ); mLayer = OGR_DS_CreateLayer( mDS, TO8F( layerName ), mOgrRef, wkbType, options );
if ( options ) if ( options )
{ {
@ -318,8 +318,6 @@ QgsVectorFileWriter::QgsVectorFileWriter(
QgsDebugMsg( "Couldn't open file " + layerName + ".qpj" ); QgsDebugMsg( "Couldn't open file " + layerName + ".qpj" );
} }
} }
OSRDestroySpatialReference( ogrRef );
} }
if ( mLayer == NULL ) if ( mLayer == NULL )
@ -1829,6 +1827,11 @@ QgsVectorFileWriter::~QgsVectorFileWriter()
{ {
OGR_DS_Destroy( mDS ); OGR_DS_Destroy( mDS );
} }
if ( mOgrRef )
{
OSRDestroySpatialReference( mOgrRef );
}
} }
QgsVectorFileWriter::WriterError QgsVectorFileWriter::WriterError

1
src/core/qgsvectorfilewriter.h
View File

@ -275,6 +275,7 @@ class CORE_EXPORT QgsVectorFileWriter
OGRDataSourceH mDS; OGRDataSourceH mDS;
OGRLayerH mLayer; OGRLayerH mLayer;
OGRSpatialReferenceH mOgrRef;
OGRGeometryH mGeom; OGRGeometryH mGeom;
QgsFields mFields; QgsFields mFields;