Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal-grass
Commits: ad76b7aa by Bas Couwenberg at 2019-04-20T07:25:05Z New upstream version 2.5.0~beta1 - - - - - bd8bc453 by Bas Couwenberg at 2019-04-20T07:25:06Z Merge tag 'upstream/2.5.0_beta1' into experimental Upstream version 2.5.0~beta1 - - - - - 7d2360fc by Bas Couwenberg at 2019-04-20T07:25:23Z New upstream beta release. - - - - - 4 changed files: - VERSION - debian/changelog - grass57dataset.cpp - ogrgrasslayer.cpp Changes: ===================================== VERSION ===================================== @@ -1 +1 @@ -2.4.1 +2.5.0 ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +libgdal-grass (2.5.0~beta1-1) UNRELEASED; urgency=medium + + * New upstream beta release. + + -- Bas Couwenberg <[email protected]> Sat, 20 Apr 2019 09:25:14 +0200 + libgdal-grass (2.4.1-1~exp1) experimental; urgency=medium * New upstream release. ===================================== grass57dataset.cpp ===================================== @@ -63,7 +63,7 @@ char *GPJ_grass_to_wkt( struct Key_Value *, #define GRASS_MAX_COLORS 100000 // what is the right value -CPL_CVSID("$Id: grass57dataset.cpp c4d5cfef28c1c6fbb03a9ab1d42835e6cfa920cc 2017-12-20 12:29:27Z Kurt Schwehr $") +CPL_CVSID("$Id: grass57dataset.cpp 8e5eeb35bf76390e3134a4ea7076dab7d478ea0e 2018-11-14 22:55:13 +0100 Even Rouault $") #if GRASS_VERSION_MAJOR >= 7 #define G_get_cellhd Rast_get_cellhd @@ -135,7 +135,10 @@ class GRASSDataset : public GDALDataset GRASSDataset(); ~GRASSDataset() override; - const char *GetProjectionRef(void) override; + const char *_GetProjectionRef(void) override; + const OGRSpatialReference* GetSpatialRef() const override { + return GetSpatialRefFromOldGetProjectionRef(); + } CPLErr GetGeoTransform( double * ) override; static GDALDataset *Open( GDALOpenInfo * ); @@ -761,7 +764,7 @@ GRASSDataset::~GRASSDataset() /* GetProjectionRef() */ /************************************************************************/ -const char *GRASSDataset::GetProjectionRef() +const char *GRASSDataset::_GetProjectionRef() { if( pszProjection == NULL ) return ""; ===================================== ogrgrasslayer.cpp ===================================== @@ -31,7 +31,7 @@ #include "ogrgrass.h" #include "cpl_conv.h" -CPL_CVSID("$Id: ogrgrasslayer.cpp 4971449609881d6ffdca70188292293852d12691 2017-12-17 16:48:14Z Even Rouault $") +CPL_CVSID("$Id: ogrgrasslayer.cpp 8e5eeb35bf76390e3134a4ea7076dab7d478ea0e 2018-11-14 22:55:13 +0100 Even Rouault $") /************************************************************************/ /* OGRGRASSLayer() */ @@ -213,6 +213,7 @@ OGRGRASSLayer::OGRGRASSLayer( int layerIndex, struct Map_info * map ) if ( srsWkt ) { poSRS = new OGRSpatialReference ( srsWkt ); + poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER); G_free ( srsWkt ); } View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/899b855d3bcc24ae1e409eaccd7398015f26d01e...7d2360fc48cb31df5458ce03e517be87c3930f0d -- View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/899b855d3bcc24ae1e409eaccd7398015f26d01e...7d2360fc48cb31df5458ce03e517be87c3930f0d You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
