[Git][debian-gis-team/gdal-grass][upstream] New upstream version 2.3.0~beta1

[Bas Couwenberg]

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


Commits:
38270223 by Bas Couwenberg at 2018-04-21T18:48:32+02:00
New upstream version 2.3.0~beta1
- - - - -


7 changed files:

- VERSION
- configure.in
- grass57dataset.cpp
- ogrgrass.h
- ogrgrassdatasource.cpp
- ogrgrassdriver.cpp
- ogrgrasslayer.cpp


Changes:

=====================================
VERSION
=====================================
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.4
+2.3.0


=====================================
configure.in
=====================================
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl ***************************************************************************
-dnl $Id: configure.in 37160 2017-01-17 07:34:22Z rouault $
+dnl $Id$
 dnl
 dnl Project:  GDAL GRASS Plugin
 dnl Purpose:  Configure source file.


=====================================
grass57dataset.cpp
=====================================
--- a/grass57dataset.cpp
+++ b/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 37964 2017-04-11 18:04:50Z rouault $");
+CPL_CVSID("$Id: grass57dataset.cpp c4d5cfef28c1c6fbb03a9ab1d42835e6cfa920cc 2017-12-20 12:29:27Z Kurt Schwehr $")
 
 #if GRASS_VERSION_MAJOR  >= 7
 #define G_get_cellhd             Rast_get_cellhd
@@ -132,11 +132,11 @@ class GRASSDataset : public GDALDataset
     double      adfGeoTransform[6];
 
   public:
-                 GRASSDataset();
-                 ~GRASSDataset();
+    GRASSDataset();
+    ~GRASSDataset() override;
 
-    virtual const char *GetProjectionRef(void) override;
-    virtual CPLErr GetGeoTransform( double * ) override;
+    const char *GetProjectionRef(void) override;
+    CPLErr GetGeoTransform( double * ) override;
 
     static GDALDataset *Open( GDALOpenInfo * );
 
@@ -174,21 +174,20 @@ class GRASSRasterBand : public GDALRasterBand
     bool        valid;
 
   public:
-
-                   GRASSRasterBand( GRASSDataset *, int,
-                                    const char *, const char * );
-    virtual        ~GRASSRasterBand();
-
-    virtual CPLErr IReadBlock( int, int, void * ) override;
-    virtual CPLErr IRasterIO ( GDALRWFlag, int, int, int, int, void *, int, int, GDALDataType,
-                               GSpacing nPixelSpace,
-                               GSpacing nLineSpace,
-                               GDALRasterIOExtraArg* psExtraArg) override;
-    virtual GDALColorInterp GetColorInterpretation() override;
-    virtual GDALColorTable *GetColorTable() override;
-    virtual double GetMinimum( int *pbSuccess = NULL ) override;
-    virtual double GetMaximum( int *pbSuccess = NULL ) override;
-    virtual double GetNoDataValue( int *pbSuccess = NULL ) override;
+    GRASSRasterBand( GRASSDataset *, int, const char *, const char * );
+    ~GRASSRasterBand() override;
+
+    CPLErr IReadBlock( int, int, void * ) override;
+    CPLErr IRasterIO ( GDALRWFlag, int, int, int, int,
+                       void *, int, int, GDALDataType,
+                       GSpacing nPixelSpace,
+                       GSpacing nLineSpace,
+                       GDALRasterIOExtraArg* psExtraArg) override;
+    GDALColorInterp GetColorInterpretation() override;
+    GDALColorTable *GetColorTable() override;
+    double GetMinimum( int *pbSuccess = NULL ) override;
+    double GetMaximum( int *pbSuccess = NULL ) override;
+    double GetNoDataValue( int *pbSuccess = NULL ) override;
 
   private:
     CPLErr ResetReading( struct Cell_head * );


=====================================
ogrgrass.h
=====================================
--- a/ogrgrass.h
+++ b/ogrgrass.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: ogrgrass.h 36501 2016-11-25 14:09:24Z rouault $
+ * $Id: ogrgrass.h 2c3d60220a2d6b41496ded571e231b96435bffa0 2016-11-25 14:09:24Z Even Rouault $
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Private definitions for OGR/GRASS driver.


=====================================
ogrgrassdatasource.cpp
=====================================
--- a/ogrgrassdatasource.cpp
+++ b/ogrgrassdatasource.cpp
@@ -31,7 +31,7 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"
 
-CPL_CVSID("$Id: ogrgrassdatasource.cpp 36368 2016-11-21 01:47:49Z rouault $");
+CPL_CVSID("$Id: ogrgrassdatasource.cpp ff8146d84de7cba8e09d212d5481ea7d2ede3e98 2017-06-27 20:47:31Z Even Rouault $")
 
 #if GRASS_VERSION_MAJOR  >= 7
 #define G__setenv                G_setenv_nogisrc


=====================================
ogrgrassdriver.cpp
=====================================
--- a/ogrgrassdriver.cpp
+++ b/ogrgrassdriver.cpp
@@ -30,7 +30,7 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"
 
-CPL_CVSID("$Id: ogrgrassdriver.cpp 36368 2016-11-21 01:47:49Z rouault $");
+CPL_CVSID("$Id: ogrgrassdriver.cpp ff8146d84de7cba8e09d212d5481ea7d2ede3e98 2017-06-27 20:47:31Z Even Rouault $")
 
 /************************************************************************/
 /*                          ~OGRGRASSDriver()                           */


=====================================
ogrgrasslayer.cpp
=====================================
--- a/ogrgrasslayer.cpp
+++ b/ogrgrasslayer.cpp
@@ -31,7 +31,7 @@
 #include "ogrgrass.h"
 #include "cpl_conv.h"
 
-CPL_CVSID("$Id: ogrgrasslayer.cpp 36368 2016-11-21 01:47:49Z rouault $");
+CPL_CVSID("$Id: ogrgrasslayer.cpp 4971449609881d6ffdca70188292293852d12691 2017-12-17 16:48:14Z Even Rouault $")
 
 /************************************************************************/
 /*                           OGRGRASSLayer()                            */
@@ -789,11 +789,9 @@ OGRFeature *OGRGRASSLayer::GetFeature( GIntBig nFeatureId )
                nFeatureId );
 
     int cat;
-    OGRFeature *poFeature = NULL;
-
     OGRGeometry *poOGR = GetFeatureGeometry ( nFeatureId, &cat );
 
-    poFeature = new OGRFeature( poFeatureDefn );
+    OGRFeature* poFeature = new OGRFeature( poFeatureDefn );
     poFeature->SetGeometryDirectly( poOGR );
     poFeature->SetFID ( nFeatureId );
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/commit/382702230978c7d5bb5c76ad2285b79006da304f

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/commit/382702230978c7d5bb5c76ad2285b79006da304f
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/20180422/5b72caff/attachment-0001.html>