[Git][debian-gis-team/gdal-grass][upstream] New upstream version 3.1.0~rc1

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / gdal-grass


Commits:
433f2e47 by Bas Couwenberg at 2020-04-27T14:56:24+02:00
New upstream version 3.1.0~rc1
- - - - -


5 changed files:

- VERSION
- grass57dataset.cpp
- ogrgrass.h
- ogrgrassdatasource.cpp
- ogrgrasslayer.cpp


Changes:

=====================================
VERSION
=====================================
@@ -1 +1 @@
-3.0.4
+3.1.0


=====================================
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 a5d5ed208537a05de4437e97b6a09b7ba44f76c9 2020-03-24 08:27:48 +0100 Kai Pastor $")
 
 #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;
 
@@ -1053,7 +1053,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/-/commit/433f2e4725a1afb15495c7518b6c879dfc7f76ba

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/commit/433f2e4725a1afb15495c7518b6c879dfc7f76ba
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/20200427/62476a81/attachment-0001.html>