Commit 9cbcaf23 authored by Victor Poughon's avatar Victor Poughon

Merge branch '1891-gdal-fixup' into 'release-6.6'

BUG: remove .Fixup() for GDAL 2.5 compatibility

See merge request !479
parents 90cb7271 bb600e26
......@@ -127,7 +127,7 @@ set(main_project_name ${_OTBModuleMacros_DEFAULT_LABEL})
# OTB version number.
set(OTB_VERSION_MAJOR "6")
set(OTB_VERSION_MINOR "6")
set(OTB_VERSION_PATCH "1")
set(OTB_VERSION_PATCH "2")
set(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}")
# Monteverdi version number (follows OTB)
......
......@@ -77,7 +77,9 @@ int GeoInformationConversion::ToEPSG(const std::string &wkt)
{
int code = -1;
OGRSpatialReference srs(wkt.c_str());
#if GDAL_VERSION_NUM < 2050000
srs.Fixup();
#endif
srs.AutoIdentifyEPSG();
const char * epsg = nullptr;
if (srs.IsGeographic())
......
OTB-v.6.6.2 - Changes since version 6.6.1 (April 26th, 2019)
------------------------------------------------------------
* Fix for GDAL 2.5 compatibility
OTB-v.6.6.1 - Changes since version 6.6.0 (December 12th, 2018)
-----------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment