瀏覽代碼

update modules to https://trac.osgeo.org/grass/changeset/63823

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63824 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 年之前
父節點
當前提交
6b9696bf3d
共有 5 個文件被更改,包括 6 次插入6 次删除
  1. 1 1
      display/d.grid/main.c
  2. 2 2
      general/g.list/main.c
  3. 1 1
      general/g.region/main.c
  4. 1 1
      ps/ps.map/r_wind.c
  5. 1 1
      raster/r.region/main.c

+ 1 - 1
display/d.grid/main.c

@@ -206,7 +206,7 @@ int main(int argc, char **argv)
 	G_fatal_error("Invalid direction: %s", direction->answer);
 
     if (align->answer || strcmp(opt2->answer, "0") == 0)
-	G__get_window(&wind, "", "WIND", G_mapset());
+	G_get_element_window(&wind, "", "WIND", G_mapset());
 
     if (strcmp(opt2->answer, "0") == 0) {
 	if (geogrid->answer)

+ 2 - 2
general/g.list/main.c

@@ -263,9 +263,9 @@ int main(int argc, char *argv[])
 	    char name[GNAME_MAX], mapset[GMAPSET_MAX];
 
 	    if (G_name_is_fully_qualified(opt.region->answer, name, mapset))
-		G__get_window(&window, "windows", name, mapset);
+		G_get_element_window(&window, "windows", name, mapset);
 	    else
-		G__get_window(&window, "windows", opt.region->answer, "");
+		G_get_element_window(&window, "windows", opt.region->answer, "");
 	}
     }
     else

+ 1 - 1
general/g.region/main.c

@@ -401,7 +401,7 @@ int main(int argc, char *argv[])
 	mapset = G_find_file2("windows", name, "");
 	if (!mapset)
 	    G_fatal_error(_("Region <%s> not found"), name);
-	G__get_window(&window, "windows", name, mapset);
+	G_get_element_window(&window, "windows", name, mapset);
     }
 
     /* raster= */

+ 1 - 1
ps/ps.map/r_wind.c

@@ -28,7 +28,7 @@ int read_wind(char *name, char *mapset)
 
     sprintf(fullname, "%s in %s", name, mapset);
 
-    G__get_window(&window, "windows", name, mapset);
+    G_get_element_window(&window, "windows", name, mapset);
 
     width = 1.;
     color_R = color_G = color_B = 0;

+ 1 - 1
raster/r.region/main.c

@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
 	G_get_window(&window);
 
     if ((name = parm.region->answer))	/* region= */
-	G__get_window(&window, "windows", name, "");
+	G_get_element_window(&window, "windows", name, "");
 
     if ((name = parm.raster->answer)) {	/* raster= */
 	Rast_get_cellhd(name, "", &window);