sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-12 00:02:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

[GDAL provider] Revise how referencing counting is done on mGdalBaseDataset

Browse Source 
initBaseDataset() used to take a reference in the case where
mGdalDataset == mGdalBaseDataset (non warped VRT) and we dropped it when
closing the dataset, which was OK

However buidPyramids() failed to acquire this reference. There was no
negative consequence as GDALDerefenceDataset() just decremented a
reference count, and GDALClose() ignores it for a non-shared dataset,
however this was an incorrected use

It is simpler for the mind to call GDALDerefenceDataset() only when
mGdalBaseDataset != mGdalDataset.
This commit is contained in:
Even Rouault 2018-10-14 19:10:22 +02:00
parent e7d15b6495
commit 651ccb43bf
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/providers/gdal/qgsgdalprovider.cpp
View File

@ -392,7 +392,7 @@ bool QgsGdalProvider::cacheGdalHandlesForLaterReuse( QgsGdalProvider *provider,
{
mgDatasetCacheSize --;
DatasetPair pair = mgDatasetCache[ candidateProvider ].takeLast();
if ( pair.mGdalBaseDataset )
if ( pair.mGdalBaseDataset != pair.mGdalDataset )
{
GDALDereferenceDataset( pair.mGdalBaseDataset );
}
@ -435,7 +435,7 @@ void QgsGdalProvider::closeCachedGdalHandlesFor( QgsGdalProvider *provider )
{
mgDatasetCacheSize --;
DatasetPair pair = iter.value().takeLast();
if ( pair.mGdalBaseDataset )
if ( pair.mGdalBaseDataset != pair.mGdalDataset )
{
GDALDereferenceDataset( pair.mGdalBaseDataset );
}
@ -464,7 +464,7 @@ QgsGdalProvider::~QgsGdalProvider()
}
else
{
if ( mGdalBaseDataset )
if ( mGdalBaseDataset != mGdalDataset )
{
GDALDereferenceDataset( mGdalBaseDataset );
}
@ -498,7 +498,10 @@ void QgsGdalProvider::closeDataset()
}
mValid = false;
GDALDereferenceDataset( mGdalBaseDataset );
if ( mGdalBaseDataset != mGdalDataset )
{
GDALDereferenceDataset( mGdalBaseDataset );
}
mGdalBaseDataset = nullptr;
GDALClose( mGdalDataset );
@ -2606,7 +2609,6 @@ void QgsGdalProvider::initBaseDataset()
{
QgsLogger::warning( QStringLiteral( "Warped VRT Creation failed." ) );
mGdalDataset = mGdalBaseDataset;
GDALReferenceDataset( mGdalDataset );
}
else
{
@ -2616,7 +2618,6 @@ void QgsGdalProvider::initBaseDataset()
else
{
mGdalDataset = mGdalBaseDataset;
GDALReferenceDataset( mGdalDataset );
}
if ( !hasGeoTransform )
@ -2645,12 +2646,7 @@ void QgsGdalProvider::initBaseDataset()
{
appendError( ERRMSG( tr( "Cannot get GDAL raster band: %1" ).arg( msg ) ) );
GDALDereferenceDataset( mGdalBaseDataset );
mGdalBaseDataset = nullptr;
GDALClose( mGdalDataset );
mGdalDataset = nullptr;
mValid = false;
closeDataset();
return;
}
// if there are subdatasets, leave the dataset open for subsequent queries