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

[OGR provider] Custom GPKG implementation of GetExtent() only needed for GDAL < 2.4

Browse Source
This commit is contained in:
Even Rouault 2018-06-04 15:05:51 +02:00
parent 4f531359ae
commit 2502a3376e
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/providers/ogr/qgsogrprovider.cpp
View File

@ -5229,6 +5229,7 @@ GIntBig QgsOgrLayer::GetApproxFeatureCount()
return OGR_L_GetFeatureCount( hLayer, TRUE );
}
#if GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(2,4,0)
static bool findMinOrMax( GDALDatasetH hDS, const QByteArray &rtreeName,
const char *varName, bool isMin, double &val )
{
@ -5276,11 +5277,13 @@ static bool findMinOrMax( GDALDatasetH hDS, const QByteArray &rtreeName,
}
return true;
}
#endif
OGRErr QgsOgrLayer::GetExtent( OGREnvelope *psExtent, bool bForce )
{
QMutexLocker locker( &ds->mutex );
#if GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(2,4,0)
// OGR_L_GetExtent() can be super slow on huge geopackage files
// so implement some approximation strategy that has reasonable runtime.
// Actually this should return a rather accurante answer.
@ -5323,6 +5326,8 @@ OGRErr QgsOgrLayer::GetExtent( OGREnvelope *psExtent, bool bForce )
return OGRERR_NONE;
}
}
#endif
return OGR_L_GetExtent( hLayer, psExtent, bForce );
}