[Git][debian-gis-team/gdal-grass][master] 5 commits: New upstream version 1.0.2
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Nov 6 11:29:19 GMT 2022
Bas Couwenberg pushed to branch master at Debian GIS Project / gdal-grass
Commits:
b0182088 by Bas Couwenberg at 2022-11-06T12:16:35+01:00
New upstream version 1.0.2
- - - - -
ed3207cf by Bas Couwenberg at 2022-11-06T12:16:36+01:00
Update upstream source from tag 'upstream/1.0.2'
Update to upstream version '1.0.2'
with Debian dir c422ec41107d143b9b66354b7ae63b8e0bb2e3e5
- - - - -
2fac01b5 by Bas Couwenberg at 2022-11-06T12:16:52+01:00
New upstream release.
- - - - -
0687f92c by Bas Couwenberg at 2022-11-06T12:17:49+01:00
Drop pr13-Add-support-for-GDAL-3.6.0.patch, included upstream.
- - - - -
d2b55b73 by Bas Couwenberg at 2022-11-06T12:18:03+01:00
Set distribution to unstable.
- - - - -
5 changed files:
- README.md
- debian/changelog
- − debian/patches/pr13-Add-support-for-GDAL-3.6.0.patch
- − debian/patches/series
- grass.cpp
Changes:
=====================================
README.md
=====================================
@@ -25,11 +25,11 @@ sudo make install
Access GRASS GIS raster data from GDAL:
```
-gdalinfo ~/grassdata/nc_spm_08_grass7/PERMANENT/cellhd/elevation
+gdalinfo $HOME/grassdata/nc_spm_08_grass7/PERMANENT/cellhd/elevation
```
Access GRASS GIS vector data from GDAL-OGR:
```
-ogrinfo -so -al ~/grassdata/nc_spm_08_grass7/PERMANENT/vector/zipcodes/head
+ogrinfo -so -al $HOME/grassdata/nc_spm_08_grass7/PERMANENT/vector/zipcodes/head
```
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libgdal-grass (1:1.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop pr13-Add-support-for-GDAL-3.6.0.patch, included upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 06 Nov 2022 12:17:52 +0100
+
libgdal-grass (1:1.0.1-2) unstable; urgency=medium
* Bump Standards-Version to 4.6.1, no changes.
=====================================
debian/patches/pr13-Add-support-for-GDAL-3.6.0.patch deleted
=====================================
@@ -1,76 +0,0 @@
-Description: Add support for GDAL 3.6.0
-Author: Even Rouault <even.rouault at spatialys.com>
-Origin: https://github.com/OSGeo/gdal-grass/pull/13
-Bug: https://github.com/OSGeo/gdal-grass/issues/12
-Bug-Debian: https://bugs.debian.org/1023506
-
---- a/grass.cpp
-+++ b/grass.cpp
-@@ -95,7 +95,7 @@ class GRASSDataset final: public GDALDat
-
- struct Cell_head sCellInfo; /* raster region */
-
-- char *pszProjection;
-+ OGRSpatialReference m_oSRS{};
-
- double adfGeoTransform[6];
-
-@@ -103,10 +103,7 @@ class GRASSDataset final: public GDALDat
- GRASSDataset();
- ~GRASSDataset() override;
-
-- const char *_GetProjectionRef(void) override;
-- const OGRSpatialReference* GetSpatialRef() const override {
-- return GetSpatialRefFromOldGetProjectionRef();
-- }
-+ const OGRSpatialReference* GetSpatialRef() const override;
- CPLErr GetGeoTransform( double * ) override;
-
- static GDALDataset *Open( GDALOpenInfo * );
-@@ -718,7 +715,7 @@ double GRASSRasterBand::GetNoDataValue(
-
- GRASSDataset::GRASSDataset()
- {
-- pszProjection = NULL;
-+ m_oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-
- adfGeoTransform[0] = 0.0;
- adfGeoTransform[1] = 1.0;
-@@ -746,20 +743,15 @@ GRASSDataset::~GRASSDataset()
-
- if ( pszElement )
- G_free ( pszElement );
--
-- G_free( pszProjection );
- }
-
- /************************************************************************/
--/* GetProjectionRef() */
-+/* GetSpatialRef() */
- /************************************************************************/
-
--const char *GRASSDataset::_GetProjectionRef()
-+const OGRSpatialReference *GRASSDataset::GetSpatialRef() const
- {
-- if( pszProjection == NULL )
-- return "";
-- else
-- return pszProjection;
-+ return m_oSRS.IsEmpty() ? nullptr : &m_oSRS;
- }
-
- /************************************************************************/
-@@ -974,9 +966,12 @@ GDALDataset *GRASSDataset::Open( GDALOpe
-
- projinfo = G_get_projinfo();
- projunits = G_get_projunits();
-- poDS->pszProjection = GPJ_grass_to_wkt ( projinfo, projunits, 0, 0);
-+ char* pszWKT = GPJ_grass_to_wkt ( projinfo, projunits, 0, 0);
- if (projinfo) G_free_key_value(projinfo);
- if (projunits) G_free_key_value(projunits);
-+ if( pszWKT )
-+ poDS->m_oSRS.importFromWkt(pszWKT);
-+ G_free( pszWKT );
-
- /* -------------------------------------------------------------------- */
- /* Create band information objects. */
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-pr13-Add-support-for-GDAL-3.6.0.patch
=====================================
grass.cpp
=====================================
@@ -95,7 +95,7 @@ class GRASSDataset final: public GDALDataset
struct Cell_head sCellInfo; /* raster region */
- char *pszProjection;
+ OGRSpatialReference m_oSRS{};
double adfGeoTransform[6];
@@ -103,10 +103,7 @@ class GRASSDataset final: public GDALDataset
GRASSDataset();
~GRASSDataset() override;
- const char *_GetProjectionRef(void) override;
- const OGRSpatialReference* GetSpatialRef() const override {
- return GetSpatialRefFromOldGetProjectionRef();
- }
+ const OGRSpatialReference* GetSpatialRef() const override;
CPLErr GetGeoTransform( double * ) override;
static GDALDataset *Open( GDALOpenInfo * );
@@ -718,7 +715,7 @@ double GRASSRasterBand::GetNoDataValue( int *pbSuccess )
GRASSDataset::GRASSDataset()
{
- pszProjection = NULL;
+ m_oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
adfGeoTransform[0] = 0.0;
adfGeoTransform[1] = 1.0;
@@ -746,20 +743,15 @@ GRASSDataset::~GRASSDataset()
if ( pszElement )
G_free ( pszElement );
-
- G_free( pszProjection );
}
/************************************************************************/
-/* GetProjectionRef() */
+/* GetSpatialRef() */
/************************************************************************/
-const char *GRASSDataset::_GetProjectionRef()
+const OGRSpatialReference *GRASSDataset::GetSpatialRef() const
{
- if( pszProjection == NULL )
- return "";
- else
- return pszProjection;
+ return m_oSRS.IsEmpty() ? nullptr : &m_oSRS;
}
/************************************************************************/
@@ -974,9 +966,12 @@ GDALDataset *GRASSDataset::Open( GDALOpenInfo * poOpenInfo )
projinfo = G_get_projinfo();
projunits = G_get_projunits();
- poDS->pszProjection = GPJ_grass_to_wkt ( projinfo, projunits, 0, 0);
+ char* pszWKT = GPJ_grass_to_wkt ( projinfo, projunits, 0, 0);
if (projinfo) G_free_key_value(projinfo);
if (projunits) G_free_key_value(projunits);
+ if( pszWKT )
+ poDS->m_oSRS.importFromWkt(pszWKT);
+ G_free( pszWKT );
/* -------------------------------------------------------------------- */
/* Create band information objects. */
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/9c952ded3b2e0ee33fa4c998ae576a644b47ad68...d2b55b73677cefe494185252dd85faae3686fb78
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/9c952ded3b2e0ee33fa4c998ae576a644b47ad68...d2b55b73677cefe494185252dd85faae3686fb78
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20221106/e0e77ce1/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list