[GRASS-SVN] r63829 - in grass/branches/releasebranch_7_0: . general/g.proj general/g.region general/g.setproj include/defs lib/gis raster/r.external raster/r.in.gdal vector/v.in.ogr
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 29 09:12:57 PST 2014
Author: martinl
Date: 2014-12-29 09:12:57 -0800 (Mon, 29 Dec 2014)
New Revision: 63829
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/general/g.proj/create.c
grass/branches/releasebranch_7_0/general/g.region/main.c
grass/branches/releasebranch_7_0/general/g.setproj/main.c
grass/branches/releasebranch_7_0/include/defs/gis.h
grass/branches/releasebranch_7_0/lib/gis/make_loc.c
grass/branches/releasebranch_7_0/lib/gis/make_mapset.c
grass/branches/releasebranch_7_0/lib/gis/put_window.c
grass/branches/releasebranch_7_0/raster/r.external/window.c
grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c
grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c
Log:
libgis: G__put_window() -> G_put_element_window()
update modules
(merge r63827-8 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828
Modified: grass/branches/releasebranch_7_0/general/g.proj/create.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.proj/create.c 2014-12-29 17:10:32 UTC (rev 63828)
+++ grass/branches/releasebranch_7_0/general/g.proj/create.c 2014-12-29 17:12:57 UTC (rev 63829)
@@ -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/branches/releasebranch_7_0/general/g.region/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.region/main.c 2014-12-29 17:10:32 UTC (rev 63828)
+++ grass/branches/releasebranch_7_0/general/g.region/main.c 2014-12-29 17:12:57 UTC (rev 63829)
@@ -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/branches/releasebranch_7_0/general/g.setproj/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.setproj/main.c 2014-12-29 17:10:32 UTC (rev 63828)
+++ grass/branches/releasebranch_7_0/general/g.setproj/main.c 2014-12-29 17:12:57 UTC (rev 63829)
@@ -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/branches/releasebranch_7_0/include/defs/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 17:10:32 UTC (rev 63828)
+++ grass/branches/releasebranch_7_0/include/defs/gis.h 2014-12-29 17:12:57 UTC (rev 63829)
@@ -588,7 +588,7 @@
/* put_window.c */
int G_put_window(const struct Cell_head *);
-int G__put_window(const struct Cell_head *, const char *, const char *);
+int G_put_element_window(const struct Cell_head *, const char *, const char *);
/* putenv.c */
void G_putenv(const char *, const char *);
Modified: grass/branches/releasebranch_7_0/lib/gis/make_loc.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/make_loc.c 2014-12-29 17:10:32 UTC (rev 63828)
+++ grass/branches/releasebranch_7_0/lib/gis/make_loc.c 2014-12-29 17:12:57 UTC (rev 63829)
@@ -75,8 +75,8 @@
G__setenv("MAPSET", "PERMANENT");
/* Create the default, and current window files */
- G__put_window(wind, "", "DEFAULT_WIND");
- G__put_window(wind, "", "WIND");
+ G_put_element_window(wind, "", "DEFAULT_WIND");
+ G_put_element_window(wind, "", "WIND");
/* Write out the PROJ_INFO, and PROJ_UNITS if available. */
if (proj_info != NULL) {
Modified: grass/branches/releasebranch_7_0/lib/gis/make_mapset.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/make_mapset.c 2014-12-29 17:10:32 UTC (rev 63828)
+++ grass/branches/releasebranch_7_0/lib/gis/make_mapset.c 2014-12-29 17:12:57 UTC (rev 63829)
@@ -83,7 +83,7 @@
G__setenv("MAPSET", mapset_name);
/* Copy default window/regions to new mapset */
- G__put_window(&default_window, "", "WIND");
+ G_put_element_window(&default_window, "", "WIND");
/* And switch back to original environment */
G_switch_env();
Modified: grass/branches/releasebranch_7_0/lib/gis/put_window.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/put_window.c 2014-12-29 17:10:32 UTC (rev 63828)
+++ grass/branches/releasebranch_7_0/lib/gis/put_window.c 2014-12-29 17:12:57 UTC (rev 63829)
@@ -15,9 +15,9 @@
#include <grass/gis.h>
/*!
- * \brief Writes the database region (window)
+ * \brief Writes the region (window)
*
- * Writes the database region file (WIND) in the user's current mapset
+ * Writes the region file (WIND) in the user's current mapset
* or when environmental variable \c WIND_OVERRIDE is set,
* it writes the region to file specified by \c WIND_OVERRIDE variable.
*
@@ -26,7 +26,7 @@
* Otherwise the whole GRASS session is affected.
*
* \warning When environmental variable \c WIND_OVERRIDE is not set,
- * this routine actually changes the database region.
+ * this routine actually changes the region.
* So in this case it should only be called by modules which the user knows
* will change the region. It is probably fair to say that only the
* \gmod{g.region} should call this routine unless \c WIND_OVERRIDE is set.
@@ -45,17 +45,17 @@
{
char *wind = getenv("WIND_OVERRIDE");
- return wind ? G__put_window(window, "windows", wind)
- : G__put_window(window, "", "WIND");
+ return wind ? G_put_element_window(window, "windows", wind)
+ : G_put_element_window(window, "", "WIND");
}
/*!
- * \brief Write the database region
+ * \brief Write the region
*
- * Writes the database region file (WIND) in the user's current mapset
+ * Writes the region file (WIND) in the user's current mapset
* from region.
- * <b>Warning:</b> Since this routine actually changes the database
+ * <b>Warning:</b> Since this routine actually changes the
* region, it should only be called by modules which the user knows
* will change the region. It is probably fair to say that only the
* <tt>g.region</tt> should call this routine.
@@ -69,7 +69,7 @@
*
* \sa G_put_window()
*/
-int G__put_window(const struct Cell_head *window, const char *dir, const char *name)
+int G_put_element_window(const struct Cell_head *window, const char *dir, const char *name)
{
FILE *fd;
Modified: grass/branches/releasebranch_7_0/raster/r.external/window.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.external/window.c 2014-12-29 17:10:32 UTC (rev 63828)
+++ grass/branches/releasebranch_7_0/raster/r.external/window.c 2014-12-29 17:12:57 UTC (rev 63829)
@@ -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/branches/releasebranch_7_0/raster/r.in.gdal/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c 2014-12-29 17:10:32 UTC (rev 63828)
+++ grass/branches/releasebranch_7_0/raster/r.in.gdal/main.c 2014-12-29 17:12:57 UTC (rev 63829)
@@ -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/branches/releasebranch_7_0/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c 2014-12-29 17:10:32 UTC (rev 63828)
+++ grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c 2014-12-29 17:12:57 UTC (rev 63829)
@@ -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);
More information about the grass-commit
mailing list