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

rouault · rouault · commit 2502a3376ee2 · 2018-06-04T15:05:51.000+02:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -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 );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5229,6 +5229,7 @@ GIntBig QgsOgrLayer::GetApproxFeatureCount()`
`5229`	`5229`	`return OGR_L_GetFeatureCount( hLayer, TRUE );`
`5230`	`5230`	`}`
`5231`	`5231`
	`5232`	`+#if GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(2,4,0)`
`5232`	`5233`	`static bool findMinOrMax( GDALDatasetH hDS, const QByteArray &rtreeName,`
`5233`	`5234`	`const char *varName, bool isMin, double &val )`
`5234`	`5235`	`{`
`@@ -5276,11 +5277,13 @@ static bool findMinOrMax( GDALDatasetH hDS, const QByteArray &rtreeName,`
`5276`	`5277`	`}`
`5277`	`5278`	`return true;`
`5278`	`5279`	`}`
	`5280`	`+#endif`
`5279`	`5281`
`5280`	`5282`	`OGRErr QgsOgrLayer::GetExtent( OGREnvelope *psExtent, bool bForce )`
`5281`	`5283`	`{`
`5282`	`5284`	`QMutexLocker locker( &ds->mutex );`
`5283`	`5285`
	`5286`	`+#if GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(2,4,0)`
`5284`	`5287`	`// OGR_L_GetExtent() can be super slow on huge geopackage files`
`5285`	`5288`	`// so implement some approximation strategy that has reasonable runtime.`
`5286`	`5289`	`// Actually this should return a rather accurante answer.`
`@@ -5323,6 +5326,8 @@ OGRErr QgsOgrLayer::GetExtent( OGREnvelope *psExtent, bool bForce )`
`5323`	`5326`	`return OGRERR_NONE;`
`5324`	`5327`	`}`
`5325`	`5328`	`}`
	`5329`	`+#endif`
	`5330`	`+`
`5326`	`5331`	`return OGR_L_GetExtent( hLayer, psExtent, bForce );`
`5327`	`5332`	`}`
`5328`	`5333`