Skip to content
Permalink
Browse files

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

(cherry picked from commit 9a8c0d2)
  • Loading branch information
jef-n committed Apr 23, 2019
1 parent adb646f commit 0f315e47b604b5d45c620118f74421fde96e7ef6
Showing with 4 additions and 0 deletions.
  1. +4 −0 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 ) )
{

0 comments on commit 0f315e4

Please sign in to comment.
You can’t perform that action at this time.