[Git][debian-gis-team/gdal-grass][ubuntu/focal] 55 commits: Bump debhelper compat to 10.
Martin Landa
gitlab at salsa.debian.org
Tue Oct 6 14:30:37 BST 2020
Martin Landa pushed to branch ubuntu/focal at Debian GIS Project / gdal-grass
Commits:
f4546d4b by Bas Couwenberg at 2020-03-19T18:01:40+01:00
Bump debhelper compat to 10.
Changes:
- Drop --parallel option, enabled by default
- Don't explicitly enable autoreconf, enabled by default
- Drop dh-autoreconf build dependency
- - - - -
a985d1ae by Bas Couwenberg at 2020-04-27T14:43:41+02:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
5000ee40 by Bas Couwenberg at 2020-04-27T14:56:24+02:00
Update upstream source from tag 'upstream/3.1.0_rc1'
Update to upstream version '3.1.0~rc1'
with Debian dir 962f3ed9a9f2f6f850e114547f7e3892a70fab81
- - - - -
433f2e47 by Bas Couwenberg at 2020-04-27T14:56:24+02:00
New upstream version 3.1.0~rc1
- - - - -
bb561518 by Bas Couwenberg at 2020-04-27T14:56:47+02:00
New upstream release candidate.
- - - - -
9719c30d by Bas Couwenberg at 2020-04-27T16:23:43+02:00
Update email address for Even Rouault.
- - - - -
ebd64932 by Bas Couwenberg at 2020-04-27T19:12:14+02:00
Set distribution to experimental.
- - - - -
78e0ebdd by Bas Couwenberg at 2020-04-29T06:10:10+02:00
New upstream version 3.1.0~rc2
- - - - -
ff8775af by Bas Couwenberg at 2020-04-29T06:10:11+02:00
Update upstream source from tag 'upstream/3.1.0_rc2'
Update to upstream version '3.1.0~rc2'
with Debian dir 43664981e4e10dbbdeadcb5f1def73fb3478fb15
- - - - -
30a1217f by Bas Couwenberg at 2020-04-29T06:10:28+02:00
New upstream release candidate.
- - - - -
a7fdd753 by Bas Couwenberg at 2020-04-29T06:11:57+02:00
Set distribution to experimental.
- - - - -
7b389686 by Bas Couwenberg at 2020-04-30T09:30:21+02:00
Drop d-shlibs build dependency.
- - - - -
4e65a5d0 by Bas Couwenberg at 2020-05-04T14:02:40+02:00
New upstream version 3.1.0~rc3
- - - - -
16e19c41 by Bas Couwenberg at 2020-05-04T14:02:41+02:00
Update upstream source from tag 'upstream/3.1.0_rc3'
Update to upstream version '3.1.0~rc3'
with Debian dir 25e4d898370c740e685fe10f874ebdcc77600aa6
- - - - -
1c9e6ee8 by Bas Couwenberg at 2020-05-04T14:03:11+02:00
New upstream release candidate.
- - - - -
f876f098 by Bas Couwenberg at 2020-05-04T14:53:47+02:00
Set distribution to experimental.
- - - - -
a1b5f85b by Bas Couwenberg at 2020-05-05T12:43:41+02:00
Update packaging for GRASS 7.8.3.
- - - - -
3bb8c5c7 by Bas Couwenberg at 2020-05-05T12:43:55+02:00
Set distribution to unstable.
- - - - -
731b4279 by Bas Couwenberg at 2020-05-05T12:45:12+02:00
Update packaging for GRASS 7.8.3.
- - - - -
1147222f by Bas Couwenberg at 2020-05-05T12:45:44+02:00
Update libgdal-dev build dependency to not required rc3.
- - - - -
9a2ea591 by Bas Couwenberg at 2020-05-05T13:00:07+02:00
Set distribution to experimental.
- - - - -
b8c6457a by Bas Couwenberg at 2020-05-07T16:32:45+02:00
New upstream version 3.1.0
- - - - -
7c239021 by Bas Couwenberg at 2020-05-07T16:32:46+02:00
Update upstream source from tag 'upstream/3.1.0'
Update to upstream version '3.1.0'
with Debian dir 1cfedf322a0790c8a2f6e7ebe232faf3fffbf083
- - - - -
3f67ec3c by Bas Couwenberg at 2020-05-07T16:33:45+02:00
New upstream release.
- - - - -
67deb805 by Bas Couwenberg at 2020-05-11T12:09:01+02:00
Set distribution to experimental.
- - - - -
a72dfbd7 by Bas Couwenberg at 2020-06-11T12:19:13+02:00
Merge branch 'experimental'
- - - - -
14523418 by Bas Couwenberg at 2020-06-11T12:19:25+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit a985d1aed504502d5d3438dee2ae17fbd474de74.
- - - - -
f9d54336 by Bas Couwenberg at 2020-06-11T12:19:55+02:00
Move from experimental to unstable.
- - - - -
b9d6db93 by Bas Couwenberg at 2020-06-22T11:59:46+02:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
dceacc44 by Bas Couwenberg at 2020-06-22T12:00:15+02:00
New upstream version 3.1.1~rc1
- - - - -
ee546e1b by Bas Couwenberg at 2020-06-22T12:00:16+02:00
Update upstream source from tag 'upstream/3.1.1_rc1'
Update to upstream version '3.1.1~rc1'
with Debian dir 58b150c57de106b7a82fcc2b181ed85046263dbf
- - - - -
42babf14 by Bas Couwenberg at 2020-06-22T12:00:46+02:00
New upstream release candidate.
- - - - -
f1e585d1 by Bas Couwenberg at 2020-06-22T12:55:50+02:00
Set distribution to experimental.
- - - - -
52e91b81 by Bas Couwenberg at 2020-06-29T15:31:04+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit b9d6db935b28098d1d660055c41f82e0fc7ef0e4.
- - - - -
866364bc by Bas Couwenberg at 2020-06-29T15:31:33+02:00
New upstream version 3.1.1
- - - - -
2cba2484 by Bas Couwenberg at 2020-06-29T15:31:35+02:00
Update upstream source from tag 'upstream/3.1.1'
Update to upstream version '3.1.1'
with Debian dir 8fc4edfaa741db5a8bb388aa8e30fa3cc896b401
- - - - -
5947803a by Bas Couwenberg at 2020-06-29T15:31:52+02:00
New upstream release.
- - - - -
0a754dfe by Bas Couwenberg at 2020-06-29T15:32:10+02:00
Set distribution to unstable.
- - - - -
3374b4f7 by Bas Couwenberg at 2020-07-07T15:17:03+02:00
New upstream version 3.1.2
- - - - -
82c7361b by Bas Couwenberg at 2020-07-07T15:17:05+02:00
Update upstream source from tag 'upstream/3.1.2'
Update to upstream version '3.1.2'
with Debian dir dfc6f77efcc5527ac53f8a8babf1010c978244e4
- - - - -
1412b904 by Bas Couwenberg at 2020-07-07T15:17:24+02:00
New upstream release.
- - - - -
ce4b650b by Bas Couwenberg at 2020-07-07T16:19:16+02:00
Set distribution to unstable.
- - - - -
bc240a71 by Bas Couwenberg at 2020-09-01T11:56:05+02:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
0b1c56fa by Bas Couwenberg at 2020-09-01T11:56:35+02:00
New upstream version 3.1.3~rc1
- - - - -
7aba61b3 by Bas Couwenberg at 2020-09-01T11:56:36+02:00
Update upstream source from tag 'upstream/3.1.3_rc1'
Update to upstream version '3.1.3~rc1'
with Debian dir 8cb46488f73e3e94c63e8adfcae26923a5682bec
- - - - -
bcfbc4a5 by Bas Couwenberg at 2020-09-01T11:57:09+02:00
New upstream release candidate.
- - - - -
29ffe43d by Bas Couwenberg at 2020-09-01T13:59:19+02:00
Update lintian overrides for renamed tags.
- - - - -
f0b8e11e by Bas Couwenberg at 2020-09-01T13:59:19+02:00
Set distribution to experimental.
- - - - -
b173d2f4 by Bas Couwenberg at 2020-09-07T12:51:34+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit bc240a71ab8c4428318a14fe413ac2716f9c7b54.
- - - - -
666919f8 by Bas Couwenberg at 2020-09-07T12:51:47+02:00
New upstream version 3.1.3
- - - - -
731be747 by Bas Couwenberg at 2020-09-07T12:51:48+02:00
Update upstream source from tag 'upstream/3.1.3'
Update to upstream version '3.1.3'
with Debian dir 676e0ab7ab8a558631d3141d0b02093d64e72652
- - - - -
bf0d23d0 by Bas Couwenberg at 2020-09-07T12:52:36+02:00
New upstream release.
- - - - -
31e61bea by Bas Couwenberg at 2020-09-07T12:52:57+02:00
Set distribution to unstable.
- - - - -
077b8770 by Bas Couwenberg at 2020-09-07T15:06:09+02:00
Move from experimental to unstable.
- - - - -
47c84e5b by Martin Landa at 2020-10-05T21:13:51+02:00
Rebuild 3.1.3 for focal
- - - - -
11 changed files:
- VERSION
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/lintian-overrides
- debian/rules
- grass57dataset.cpp
- ogrgrass.h
- ogrgrassdatasource.cpp
- ogrgrasslayer.cpp
Changes:
=====================================
VERSION
=====================================
@@ -1 +1 @@
-3.0.4
+3.1.3
=====================================
debian/changelog
=====================================
@@ -1,3 +1,53 @@
+libgdal-grass (3.1.3-2) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 07 Sep 2020 15:06:04 +0200
+
+libgdal-grass (3.1.3-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 07 Sep 2020 12:52:41 +0200
+
+libgdal-grass (3.1.3~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Update lintian overrides for renamed tags.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 01 Sep 2020 11:57:35 +0200
+
+libgdal-grass (3.1.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 07 Jul 2020 15:17:33 +0200
+
+libgdal-grass (3.1.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 29 Jun 2020 15:31:56 +0200
+
+libgdal-grass (3.1.1~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 22 Jun 2020 12:55:38 +0200
+
+libgdal-grass (3.1.0-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 11 Jun 2020 12:19:39 +0200
+
+libgdal-grass (3.1.0-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 11 May 2020 12:08:49 +0200
+
libgdal-grass (3.0.4-2~focal1) focal; urgency=medium
* Rebuild for focal.
@@ -10,6 +60,47 @@ libgdal-grass (3.0.4-1~focal1) focal; urgency=medium
-- Martin Landa <landa.martin at gmail.com> Wed, 06 May 2020 22:24:47 +0200
+libgdal-grass (3.1.0~rc3-1~exp2) experimental; urgency=medium
+
+ * Update packaging for GRASS 7.8.3.
+ * Update libgdal-dev build dependency to not required rc3.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 05 May 2020 12:59:56 +0200
+
+libgdal-grass (3.1.0~rc3-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Drop d-shlibs build dependency.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 04 May 2020 14:53:32 +0200
+
+libgdal-grass (3.1.0~rc2-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 29 Apr 2020 06:11:29 +0200
+
+libgdal-grass (3.1.0~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Bump debhelper compat to 10, changes:
+ - Drop --parallel option, enabled by default
+ - Don't explicitly enable autoreconf, enabled by default
+ - Drop dh-autoreconf build dependency
+ * Update email address for Even Rouault.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 27 Apr 2020 19:12:00 +0200
+
+libgdal-grass (3.0.4-2) unstable; urgency=medium
+
+ * Bump debhelper compat to 10, changes:
+ - Drop --parallel option, enabled by default
+ - Don't explicitly enable autoreconf, enabled by default
+ - Drop dh-autoreconf build dependency
+ * Update packaging for GRASS 7.8.3.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 05 May 2020 12:43:43 +0200
+
libgdal-grass (3.0.4-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+10
=====================================
debian/control
=====================================
@@ -4,12 +4,10 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
Bas Couwenberg <sebastic at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
- d-shlibs,
- grass (>= 7.8.3),
- grass-dev (>= 7.8.3),
- libgdal-dev (>= 3.0.4),
+Build-Depends: debhelper (>= 10~),
+ grass (>= 7.8.4),
+ grass-dev (>= 7.8.4),
+ libgdal-dev (>= 3.1.3),
libpq-dev,
lsb-release,
pkg-config
=====================================
debian/copyright
=====================================
@@ -9,7 +9,7 @@ Source: GDAL-GRASS source is extracted from the GDAL source.
Files: *
Copyright: 1998-2013, Frank Warmerdam <warmerdam at pobox.com>
- 2007-2010, Even Rouault <even dot rouault at mines-paris dot org>
+ 2007-2010, Even Rouault <even dot rouault at spatialys.com>
2005, Radim Blazek <radim.blazek at gmail.com>
License: MIT
=====================================
debian/lintian-overrides
=====================================
@@ -1,4 +1,4 @@
# The run path has been added to get GRASS internal library
-binary-or-shlib-defines-rpath usr/lib/gdalplugins/gdal_GRASS.so /usr/lib/grass*/lib
-binary-or-shlib-defines-rpath usr/lib/gdalplugins/ogr_GRASS.so /usr/lib/grass*/lib
+custom-library-search-path usr/lib/gdalplugins/gdal_GRASS.so /usr/lib/grass*/lib
+custom-library-search-path usr/lib/gdalplugins/ogr_GRASS.so /usr/lib/grass*/lib
=====================================
debian/rules
=====================================
@@ -25,7 +25,7 @@ GRASS=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2))
GRASS_ABI=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2,3 | sed -e 's/RC/-/'))
%:
- dh $@ --with autoreconf --parallel
+ dh $@
override_dh_autoreconf:
mv configure configure.pre-autoreconf
=====================================
grass57dataset.cpp
=====================================
@@ -9,7 +9,7 @@
*
******************************************************************************
* Copyright (c) 2000 Frank Warmerdam <warmerdam at pobox.com>
- * Copyright (c) 2007-2010, Even Rouault <even dot rouault at mines-paris dot org>
+ * Copyright (c) 2007-2010, Even Rouault <even dot rouault at spatialys.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -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 8e5eeb35bf76390e3134a4ea7076dab7d478ea0e 2018-11-14 22:55:13 +0100 Even Rouault $")
+CPL_CVSID("$Id: grass57dataset.cpp 7aa76ba75c2c4c1b814cf1489838533b56a1946e 2020-08-21 19:19:23 +0200 Markus Metz $")
#if GRASS_VERSION_MAJOR >= 7
#define G_get_cellhd Rast_get_cellhd
@@ -117,7 +117,7 @@ static int Grass2CPLErrorHook( char * pszMessage, int bFatal )
class GRASSRasterBand;
-class GRASSDataset : public GDALDataset
+class GRASSDataset final: public GDALDataset
{
friend class GRASSRasterBand;
@@ -153,7 +153,7 @@ class GRASSDataset : public GDALDataset
/* ==================================================================== */
/************************************************************************/
-class GRASSRasterBand : public GDALRasterBand
+class GRASSRasterBand final: public GDALRasterBand
{
friend class GRASSDataset;
@@ -193,6 +193,7 @@ class GRASSRasterBand : public GDALRasterBand
double GetNoDataValue( int *pbSuccess = NULL ) override;
private:
+ void SetWindow( struct Cell_head * );
CPLErr ResetReading( struct Cell_head * );
};
@@ -300,10 +301,8 @@ GRASSRasterBand::GRASSRasterBand( GRASSDataset *poDSIn, int nBandIn,
nBlockYSize = 1;
G_set_window( &(poDSIn->sCellInfo) );
- if ( (hCell = G_open_cell_old((char *) pszCellName, (char *) pszMapset)) < 0 ) {
- CPLError( CE_Warning, CPLE_AppDefined, "GRASS: Cannot open raster '%s'", pszCellName );
- return;
- }
+ // open the raster only for actual reading
+ hCell = -1;
G_copy((void *) &sOpenWindow, (void *) &(poDSIn->sCellInfo), sizeof(struct Cell_head));
/* -------------------------------------------------------------------- */
@@ -413,11 +412,38 @@ GRASSRasterBand::~GRASSRasterBand()
}
/************************************************************************/
-/* ResetReading */
+/* SetWindow */
/* */
-/* Reset current window and reopen cell if the window has changed, */
+/* Helper for ResetReading */
+/* close the current GRASS raster band, actually set the new window, */
/* reset GRASS variables */
/* */
+/* Returns nothing */
+/************************************************************************/
+void GRASSRasterBand::SetWindow ( struct Cell_head *sNewWindow )
+{
+ if( hCell >= 0 ) {
+ G_close_cell( hCell );
+ hCell = -1;
+ }
+
+ /* Set window */
+ G_set_window( sNewWindow );
+
+ /* Set GRASS env to the current raster, don't open the raster */
+ G__setenv( "GISDBASE", ((GRASSDataset *)poDS)->pszGisdbase );
+ G__setenv( "LOCATION_NAME", ((GRASSDataset *)poDS)->pszLocation );
+ G__setenv( "MAPSET", pszMapset);
+ G_reset_mapsets();
+ G_add_mapset_to_search_path ( pszMapset );
+}
+
+/************************************************************************/
+/* ResetReading */
+/* */
+/* Reset current window for a new reading request, */
+/* close the current GRASS raster band, reset GRASS variables */
+/* */
/* Returns CE_Failure if fails, otherwise CE_None */
/************************************************************************/
CPLErr GRASSRasterBand::ResetReading ( struct Cell_head *sNewWindow )
@@ -429,27 +455,7 @@ CPLErr GRASSRasterBand::ResetReading ( struct Cell_head *sNewWindow )
sNewWindow->ew_res != sOpenWindow.ew_res || sNewWindow->ns_res != sOpenWindow.ns_res ||
sNewWindow->rows != sOpenWindow.rows || sNewWindow->cols != sOpenWindow.cols )
{
- if( hCell >= 0 ) {
- G_close_cell( hCell );
- hCell = -1;
- }
-
- /* Set window */
- G_set_window( sNewWindow );
-
- /* Open raster */
- G__setenv( "GISDBASE", ((GRASSDataset *)poDS)->pszGisdbase );
- G__setenv( "LOCATION_NAME", ((GRASSDataset *)poDS)->pszLocation );
- G__setenv( "MAPSET", pszMapset);
- G_reset_mapsets();
- G_add_mapset_to_search_path ( pszMapset );
-
- if ( (hCell = G_open_cell_old( pszCellName, pszMapset)) < 0 ) {
- CPLError( CE_Warning, CPLE_AppDefined, "GRASS: Cannot open raster '%s'", pszCellName );
- this->valid = false;
- return CE_Failure;
- }
-
+ SetWindow ( sNewWindow );
G_copy((void *) &sOpenWindow, (void *) sNewWindow, sizeof(struct Cell_head));
}
else
@@ -465,8 +471,7 @@ CPLErr GRASSRasterBand::ResetReading ( struct Cell_head *sNewWindow )
sNewWindow->rows != sCurrentWindow.rows || sNewWindow->cols != sCurrentWindow.cols
)
{
- /* Reset window */
- G_set_window( sNewWindow );
+ SetWindow ( sNewWindow );
}
}
@@ -488,6 +493,13 @@ CPLErr GRASSRasterBand::IReadBlock( int /*nBlockXOff*/, int nBlockYOff,
if ( ResetReading ( &(((GRASSDataset *)poDS)->sCellInfo) ) != CE_None ) {
return CE_Failure;
}
+ // open for reading
+ if (hCell < 0) {
+ if ( (hCell = G_open_cell_old((char *) pszCellName, (char *) pszMapset)) < 0 ) {
+ CPLError( CE_Failure, CPLE_AppDefined, "GRASS: Cannot open raster '%s'", pszCellName );
+ return CE_Failure;
+ }
+ }
if ( eDataType == GDT_Byte || eDataType == GDT_UInt16 ) {
CELL *cbuf = G_allocate_c_raster_buf();
@@ -518,6 +530,10 @@ CPLErr GRASSRasterBand::IReadBlock( int /*nBlockXOff*/, int nBlockYOff,
G_get_d_raster_row ( hCell, (DCELL *) pImage, nBlockYOff );
}
+ // close to avoid confusion with other GRASS raster bands
+ G_close_cell( hCell );
+ hCell = -1;
+
return CE_None;
}
@@ -563,6 +579,13 @@ CPLErr GRASSRasterBand::IRasterIO ( GDALRWFlag eRWFlag,
{
return CE_Failure;
}
+ // open for reading
+ if (hCell < 0) {
+ if ( (hCell = G_open_cell_old((char *) pszCellName, (char *) pszMapset)) < 0 ) {
+ CPLError( CE_Failure, CPLE_AppDefined, "GRASS: Cannot open raster '%s'", pszCellName );
+ return CE_Failure;
+ }
+ }
/* Read Data */
CELL *cbuf = NULL;
@@ -635,6 +658,10 @@ CPLErr GRASSRasterBand::IRasterIO ( GDALRWFlag eRWFlag,
if ( fbuf ) G_free ( fbuf );
if ( dbuf ) G_free ( dbuf );
+ // close to avoid confusion with other GRASS raster bands
+ G_close_cell( hCell );
+ hCell = -1;
+
return CE_None;
}
@@ -1053,7 +1080,7 @@ void GDALRegister_GRASS()
poDriver->SetDescription( "GRASS" );
poDriver->SetMetadataItem( GDAL_DCAP_RASTER, "YES" );
poDriver->SetMetadataItem( GDAL_DMD_LONGNAME, "GRASS Rasters (5.7+)" );
- poDriver->SetMetadataItem( GDAL_DMD_HELPTOPIC, "frmt_grass.html" );
+ poDriver->SetMetadataItem( GDAL_DMD_HELPTOPIC, "drivers/raster/grass.html" );
poDriver->pfnOpen = GRASSDataset::Open;
=====================================
ogrgrass.h
=====================================
@@ -1,5 +1,5 @@
/******************************************************************************
- * $Id: ogrgrass.h 2c3d60220a2d6b41496ded571e231b96435bffa0 2016-11-25 14:09:24Z Even Rouault $
+ * $Id: ogrgrass.h 842d122d2f23aaebb28362e083b52d6bc7dbcde2 2019-08-11 17:42:34 +0200 Even Rouault $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Private definitions for OGR/GRASS driver.
@@ -47,7 +47,7 @@ extern "C" {
/************************************************************************/
/* OGRGRASSLayer */
/************************************************************************/
-class OGRGRASSLayer : public OGRLayer
+class OGRGRASSLayer final: public OGRLayer
{
public:
OGRGRASSLayer( int layer, struct Map_info * map );
@@ -125,7 +125,7 @@ class OGRGRASSLayer : public OGRLayer
/************************************************************************/
/* OGRGRASSDataSource */
/************************************************************************/
-class OGRGRASSDataSource : public OGRDataSource
+class OGRGRASSDataSource final: public OGRDataSource
{
public:
OGRGRASSDataSource();
@@ -159,7 +159,7 @@ class OGRGRASSDataSource : public OGRDataSource
/************************************************************************/
/* OGRGRASSDriver */
/************************************************************************/
-class OGRGRASSDriver : public OGRSFDriver
+class OGRGRASSDriver final: public OGRSFDriver
{
public:
virtual ~OGRGRASSDriver();
=====================================
ogrgrassdatasource.cpp
=====================================
@@ -6,7 +6,7 @@
*
******************************************************************************
* Copyright (c) 2005, Radim Blazek <radim.blazek at gmail.com>
- * Copyright (c) 2008-2010, Even Rouault <even dot rouault at mines-paris dot org>
+ * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -31,7 +31,7 @@
#include "cpl_conv.h"
#include "cpl_string.h"
-CPL_CVSID("$Id: ogrgrassdatasource.cpp ff8146d84de7cba8e09d212d5481ea7d2ede3e98 2017-06-27 20:47:31Z Even Rouault $")
+CPL_CVSID("$Id: ogrgrassdatasource.cpp b1c9c12ad373e40b955162b45d704070d4ebf7b0 2019-06-19 16:50:15 +0200 Even Rouault $")
#if GRASS_VERSION_MAJOR >= 7
#define G__setenv G_setenv_nogisrc
=====================================
ogrgrasslayer.cpp
=====================================
@@ -6,7 +6,7 @@
*
******************************************************************************
* Copyright (c) 2005, Radim Blazek <radim.blazek at gmail.com>
- * Copyright (c) 2008-2010, Even Rouault <even dot rouault at mines-paris dot org>
+ * Copyright (c) 2008-2010, Even Rouault <even dot rouault at spatialys.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -31,7 +31,7 @@
#include "ogrgrass.h"
#include "cpl_conv.h"
-CPL_CVSID("$Id: ogrgrasslayer.cpp 8e5eeb35bf76390e3134a4ea7076dab7d478ea0e 2018-11-14 22:55:13 +0100 Even Rouault $")
+CPL_CVSID("$Id: ogrgrasslayer.cpp b1c9c12ad373e40b955162b45d704070d4ebf7b0 2019-06-19 16:50:15 +0200 Even Rouault $")
/************************************************************************/
/* OGRGRASSLayer() */
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/38569017e62f903f7aa23647b6c652e7b228a8c2...47c84e5bfcd7cfcccd4fbe3951b725c343227663
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/38569017e62f903f7aa23647b6c652e7b228a8c2...47c84e5bfcd7cfcccd4fbe3951b725c343227663
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/20201006/b2aec0cc/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list