avoid OSRFixup with GDAL >= 2.5 (fixes #21902)

jef-n · jef-n · commit 0f315e47b604 · 2019-04-23T08:53:49.000+02:00
(cherry picked from commit 9a8c0d2)
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -637,8 +637,10 @@ bool QgsCoordinateReferenceSystem::createFromWkt( const QString &wkt )
   {
     CPLFree( proj4src );
 
+#if GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(2,5,0)
     // try fixed up version
     OSRFixup( d->mCRS );
+#endif
 
     OSRExportToProj4( d->mCRS, &proj4src );
 
@@ -1175,9 +1177,11 @@ void QgsCoordinateReferenceSystem::setMapUnits()
 
   char *unitName = nullptr;
 
+#if GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(2,5,0)
   // Of interest to us is that this call adds in a unit parameter if
   // one doesn't already exist.
   OSRFixup( d->mCRS );
+#endif
 
   if ( OSRIsProjected( d->mCRS ) )
   {
