diff --git a/.mailmap b/.mailmap index 4f5b29673164f0f4717494cec297a17c037b4d73..40ef95e52d046d8d1917e474e2da727203f8fa46 100644 --- a/.mailmap +++ b/.mailmap @@ -54,6 +54,7 @@ Julien Malik <julien.malik@c-s.fr> Julien Malik <julien.m Julien Michel <julien.michel@cnes.fr> Julien Michel <julien.michel@cnes.fr> Julien Michel <julien.michel@c-s.fr> Julien Michel <julien.michel@cnes.fr> Julien Michel <julien.michel@orfeo-toolbox.org> +Julien Osman <julien.osman@c-s.fr> Laurențiu Nicola <lnicola@dend.ro> Laurentiu Nicola <lnicola@dend.ro> Laurențiu Nicola <lnicola@dend.ro> Laurențiu Nicola <grayshade@gmail.com> Luc Hermitte <luc.hermitte@c-s.fr> Luc Hermitte <luc.hermitte@cnes.fr> diff --git a/Modules/Adapters/GdalAdapters/include/otbSpatialReference.h b/Modules/Adapters/GdalAdapters/include/otbSpatialReference.h index ca2059fd579f0e574199deb72342fd8072df501b..37611309fd1244773b358d97f5ee36b087bade10 100644 --- a/Modules/Adapters/GdalAdapters/include/otbSpatialReference.h +++ b/Modules/Adapters/GdalAdapters/include/otbSpatialReference.h @@ -176,11 +176,6 @@ public: */ static void UTMFromGeoPoint(double lon, double lat, unsigned int& zone, hemisphere& hem); - /** - * Returns the internal OGRSpatialReference - */ - OGRSpatialReference* getOGRSpatialReference(); - private: /// Constructor from wrapped type. ref will be cloned. SpatialReference(const OGRSpatialReference* ref); diff --git a/Modules/Adapters/GdalAdapters/src/otbSpatialReference.cxx b/Modules/Adapters/GdalAdapters/src/otbSpatialReference.cxx index 1e3f4b8c8ffc516fa9a6c900834be84aa0a4c81f..120f8d0ae2bbd12b4207965c775e567a8d73806c 100644 --- a/Modules/Adapters/GdalAdapters/src/otbSpatialReference.cxx +++ b/Modules/Adapters/GdalAdapters/src/otbSpatialReference.cxx @@ -294,11 +294,6 @@ void SpatialReference::UTMFromGeoPoint(double lon, double lat, unsigned int& zon assert(zone <= 60); } -OGRSpatialReference* SpatialReference::getOGRSpatialReference() -{ - return m_SR.get(); -} - #if GDAL_VERSION_NUM >= 3000000 void SpatialReference::SetAxisMappingStrategy(OSRAxisMappingStrategy strategy) { diff --git a/Modules/IO/IOGDAL/src/otbGDALImageIO.cxx b/Modules/IO/IOGDAL/src/otbGDALImageIO.cxx index 86e0d2ded19bdb803db52831303df85d4fefa144..1cbbea7e226d732d4e434666d778d9a638f3fa9e 100644 --- a/Modules/IO/IOGDAL/src/otbGDALImageIO.cxx +++ b/Modules/IO/IOGDAL/src/otbGDALImageIO.cxx @@ -1176,7 +1176,7 @@ void GDALImageIO::Write(const void* buffer) if (m_epsgCode != 0) { auto spatialReference = SpatialReference::FromEPSG(m_epsgCode); - m_Dataset->GetDataSet()->SetSpatialRef(spatialReference.getOGRSpatialReference()); + m_Dataset->GetDataSet()->SetProjection(spatialReference.ToWkt().c_str()); } // Convert buffer from void * to unsigned char *