[GRASS-SVN] r63828 - in grass/trunk: general/g.proj general/g.region general/g.setproj raster/r.external raster/r.in.gdal vector/v.in.ogr

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-29 09:10:32 -0800 (Mon, 29 Dec 2014)
New Revision: 63828

Modified:
   grass/trunk/general/g.proj/create.c
   grass/trunk/general/g.region/main.c
   grass/trunk/general/g.setproj/main.c
   grass/trunk/raster/r.external/window.c
   grass/trunk/raster/r.in.gdal/main.c
   grass/trunk/vector/v.in.ogr/main.c
Log:
update modules to r63827


Modified: grass/trunk/general/g.proj/create.c
===================================================================
--- grass/trunk/general/g.proj/create.c	2014-12-29 17:09:54 UTC (rev 63827)
+++ grass/trunk/general/g.proj/create.c	2014-12-29 17:10:32 UTC (rev 63828)
@@ -57,8 +57,8 @@
 	(old_cellhd.proj != cellhd.proj)) {
 	/* Recreate the default, and current window files if projection
 	 * number or zone have changed */
-	G__put_window(&cellhd, "", "DEFAULT_WIND");
-	G__put_window(&cellhd, "", "WIND");
+	G_put_element_window(&cellhd, "", "DEFAULT_WIND");
+	G_put_element_window(&cellhd, "", "WIND");
 	G_message(_("Default region was updated to the new projection, but if you have "
 		    "multiple mapsets `g.region -d` should be run in each to update the "
 		    "region from the default"));

Modified: grass/trunk/general/g.region/main.c
===================================================================
--- grass/trunk/general/g.region/main.c	2014-12-29 17:09:54 UTC (rev 63827)
+++ grass/trunk/general/g.region/main.c	2014-12-29 17:10:32 UTC (rev 63828)
@@ -756,7 +756,7 @@
     if ((name = parm.save->answer)) {
 	temp_window = window;
 	G_adjust_Cell_head3(&temp_window, 0, 0, 0);
-	if (G__put_window(&temp_window, "windows", name) < 0)
+	if (G_put_element_window(&temp_window, "windows", name) < 0)
 	    G_fatal_error(_("Unable to set region <%s>"), name);
     }
 
@@ -768,7 +768,7 @@
 
     if (flag.savedefault->answer) {
 	if (strcmp(G_mapset(), "PERMANENT") == 0) {
-	    G__put_window(&window, "", "DEFAULT_WIND");
+	    G_put_element_window(&window, "", "DEFAULT_WIND");
 	}
 	else {
 	    G_fatal_error(_("Unable to change default region. "

Modified: grass/trunk/general/g.setproj/main.c
===================================================================
--- grass/trunk/general/g.setproj/main.c	2014-12-29 17:09:54 UTC (rev 63827)
+++ grass/trunk/general/g.setproj/main.c	2014-12-29 17:10:32 UTC (rev 63828)
@@ -639,7 +639,7 @@
 	G_free_key_value(in_unit_keys);
     }				/* if */
 
-    if (G__put_window(&cellhd, "", "DEFAULT_WIND") < 0)
+    if (G_put_element_window(&cellhd, "", "DEFAULT_WIND") < 0)
 	G_fatal_error(_("Unable to write to DEFAULT_WIND region file"));
     fprintf(stderr,
 	    _("\nProjection information has been recorded for this location\n\n"));

Modified: grass/trunk/raster/r.external/window.c
===================================================================
--- grass/trunk/raster/r.external/window.c	2014-12-29 17:09:54 UTC (rev 63827)
+++ grass/trunk/raster/r.external/window.c	2014-12-29 17:10:32 UTC (rev 63828)
@@ -89,7 +89,7 @@
     cur_wind.east = cur_wind.west + cur_wind.cols * cur_wind.ew_res;
 
     if (strcmp(G_mapset(), "PERMANENT") == 0) {
-	G__put_window(&cur_wind, "", "DEFAULT_WIND");
+	G_put_element_window(&cur_wind, "", "DEFAULT_WIND");
 	G_message(_("Default region for this location updated")); 
     }
     G_put_window(&cur_wind);

Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c	2014-12-29 17:09:54 UTC (rev 63827)
+++ grass/trunk/raster/r.in.gdal/main.c	2014-12-29 17:10:32 UTC (rev 63828)
@@ -780,7 +780,7 @@
 	cur_wind.east = cur_wind.west + cur_wind.cols * cur_wind.ew_res;
 
 	if (strcmp(G_mapset(), "PERMANENT") == 0) {
-	    G__put_window(&cur_wind, "", "DEFAULT_WIND");
+	    G_put_element_window(&cur_wind, "", "DEFAULT_WIND");
 	    G_message(_("Default region for this location updated"));
 	}
 	G_put_window(&cur_wind);

Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c	2014-12-29 17:09:54 UTC (rev 63827)
+++ grass/trunk/vector/v.in.ogr/main.c	2014-12-29 17:10:32 UTC (rev 63828)
@@ -1632,7 +1632,7 @@
 	cur_wind.east = cur_wind.west + cur_wind.cols * cur_wind.ew_res;
 
 	if (strcmp(G_mapset(), "PERMANENT") == 0) {
-	    G__put_window(&cur_wind, "", "DEFAULT_WIND");
+	    G_put_element_window(&cur_wind, "", "DEFAULT_WIND");
 	    G_message(_("Default region for this location updated"));
 	}
 	G_put_window(&cur_wind);