sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

avoid OSRFixup with GDAL >= 2.5

Browse Source
This commit is contained in:
Juergen E. Fischer 2019-02-02 00:35:24 +01:00
parent 122d5c3efd
commit 9a8c0d2898
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/qgscoordinatereferencesystem.cpp
View File

@ -638,8 +638,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 );
@ -1176,9 +1178,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 ) )
{