This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch upstream
in repository gdal-grass.

commit f74b7fa55e6283e51b7ad466b6a49df57eccd756
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sun May 4 14:43:01 2014 +0200

    Imported Upstream version 1.11.0
---
 VERSION                |  2 +-
 grass57dataset.cpp     | 17 ++++++++++++-----
 ogrgrassdatasource.cpp |  7 +++++--
 ogrgrasslayer.cpp      |  5 +++--
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/VERSION b/VERSION
index 4dae298..1cac385 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.10.1
+1.11.0
diff --git a/grass57dataset.cpp b/grass57dataset.cpp
index a2a3dbf..06a142f 100644
--- a/grass57dataset.cpp
+++ b/grass57dataset.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: grass57dataset.cpp 20157 2010-07-28 19:32:04Z rouault $
+ * $Id: grass57dataset.cpp 27044 2014-03-16 23:41:27Z rouault $
  *
  * Project:  GRASS Driver
  * Purpose:  Implement GRASS raster read/write support
@@ -10,6 +10,7 @@
  *
  ******************************************************************************
  * Copyright (c) 2000 Frank Warmerdam <warmer...@pobox.com>
+ * Copyright (c) 2007-2010, Even Rouault <even dot rouault at mines-paris dot 
org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -45,9 +46,15 @@ extern "C" {
 #include <grass/gprojects.h>
 #include <grass/gis.h>
 
-char *GPJ_grass_to_wkt(struct Key_Value *proj_info,
-                      struct Key_Value *proj_units,
-                      int esri_style, int prettify);
+#if GRASS_VERSION_MAJOR  >= 7
+char *GPJ_grass_to_wkt(const struct Key_Value *,
+                      const struct Key_Value *,
+                      int, int);
+#else
+char *GPJ_grass_to_wkt(struct Key_Value *,
+                      struct Key_Value *,
+                      int, int);
+#endif
 }
 
 #include "gdal_priv.h"
@@ -56,7 +63,7 @@ char *GPJ_grass_to_wkt(struct Key_Value *proj_info,
 
 #define GRASS_MAX_COLORS 100000  // what is the right value
 
-CPL_CVSID("$Id: grass57dataset.cpp 20157 2010-07-28 19:32:04Z rouault $");
+CPL_CVSID("$Id: grass57dataset.cpp 27044 2014-03-16 23:41:27Z rouault $");
 
 CPL_C_START
 void   GDALRegister_GRASS(void);
diff --git a/ogrgrassdatasource.cpp b/ogrgrassdatasource.cpp
index 565af4a..9298c45 100644
--- a/ogrgrassdatasource.cpp
+++ b/ogrgrassdatasource.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: ogrgrassdatasource.cpp 20157 2010-07-28 19:32:04Z rouault $
+ * $Id: ogrgrassdatasource.cpp 27044 2014-03-16 23:41:27Z rouault $
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Implements OGRGRASSDataSource class.
@@ -7,6 +7,7 @@
  *
  ******************************************************************************
  * Copyright (c) 2005, Radim Blazek <radim.bla...@gmail.com>
+ * Copyright (c) 2008-2010, Even Rouault <even dot rouault at mines-paris dot 
org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,7 +32,7 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"
 
-CPL_CVSID("$Id: ogrgrassdatasource.cpp 20157 2010-07-28 19:32:04Z rouault $");
+CPL_CVSID("$Id: ogrgrassdatasource.cpp 27044 2014-03-16 23:41:27Z rouault $");
 
 /************************************************************************/
 /*                         Grass2CPLErrorHook()                         */
@@ -188,7 +189,9 @@ int OGRGRASSDataSource::Open( const char * pszNewName, int 
bUpdate,
 /* -------------------------------------------------------------------- */
 /*      Open GRASS vector map                                           */
 /* -------------------------------------------------------------------- */
+#if GRASS_VERSION_MAJOR  < 7
     Vect_set_fatal_error ( GV_FATAL_PRINT ); // Print error and continue
+#endif
     Vect_set_open_level (2);
     int level = Vect_open_old ( &map, pszMap, pszMapset);
 
diff --git a/ogrgrasslayer.cpp b/ogrgrasslayer.cpp
index d0b6533..0e2462f 100644
--- a/ogrgrasslayer.cpp
+++ b/ogrgrasslayer.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: ogrgrasslayer.cpp 20157 2010-07-28 19:32:04Z rouault $
+ * $Id: ogrgrasslayer.cpp 27044 2014-03-16 23:41:27Z rouault $
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Implements OGRGRASSLayer class.
@@ -7,6 +7,7 @@
  *
  ******************************************************************************
  * Copyright (c) 2005, Radim Blazek <radim.bla...@gmail.com>
+ * Copyright (c) 2008-2010, Even Rouault <even dot rouault at mines-paris dot 
org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,7 +32,7 @@
 #include "ogrgrass.h"
 #include "cpl_conv.h"
 
-CPL_CVSID("$Id: ogrgrasslayer.cpp 20157 2010-07-28 19:32:04Z rouault $");
+CPL_CVSID("$Id: ogrgrasslayer.cpp 27044 2014-03-16 23:41:27Z rouault $");
 
 /************************************************************************/
 /*                           OGRGRASSLayer()                            */

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/gdal-grass.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to