瀏覽代碼

Don't bother checking the return code from G_get_set_window()
It never returns a failure code, and soon won't return anything


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@34460 15284696-431f-4ddb-bdfa-cd5b030d7da7

Glynn Clements 16 年之前
父節點
當前提交
d3476f6507
共有 6 個文件被更改,包括 7 次插入14 次删除
  1. 1 3
      raster/r.flow/main.c
  2. 1 2
      raster/r.resamp.rst/main.c
  3. 1 2
      raster/r.sun/main.c
  4. 2 3
      raster/r.terraflow/main.cc
  5. 1 2
      vector/v.surf.rst/main.c
  6. 1 2
      vector/v.vol.rst/main.c

+ 1 - 3
raster/r.flow/main.c

@@ -493,9 +493,7 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-
-    if (G_get_set_window(&region) == -1)
-	G_fatal_error(_("Unable to get current region"));
+    G_get_set_window(&region);
 
     larger = ((region.cols < region.rows) ? region.rows : region.cols);
     default_skip = (larger < 50) ? 1 : (int)(larger / 50);

+ 1 - 2
raster/r.resamp.rst/main.c

@@ -283,8 +283,7 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (G_get_set_window(&winhd) == -1)
-	G_fatal_error(_("Retrieving and setting region failed"));
+    G_get_set_window(&winhd);
 
     inp_ew_res = winhd.ew_res;
     inp_ns_res = winhd.ns_res;

+ 1 - 2
raster/r.sun/main.c

@@ -361,8 +361,7 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (G_get_set_window(&cellhd) == -1)
-	G_fatal_error("G_get_set_window() failed");
+    G_get_set_window(&cellhd);
 
     stepx = cellhd.ew_res;
     stepy = cellhd.ns_res;

+ 2 - 3
raster/r.terraflow/main.cc

@@ -461,9 +461,8 @@ main(int argc, char *argv[]) {
   parse_args(argc, argv);
 
   /* get the current region and dimensions */  
-  if (G_get_set_window(region) == -1) {
-    G_fatal_error("r.terraflow: error getting current region");
-  }
+  G_get_set_window(region);
+
   check_args();
 
   int nr = G_window_rows();

+ 1 - 2
vector/v.surf.rst/main.c

@@ -334,8 +334,7 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (G_get_set_window(&cellhd) == -1)
-	G_fatal_error("G_get_set_window() failed");
+    G_get_set_window(&cellhd);
 
     ew_res = cellhd.ew_res;
     ns_res = cellhd.ns_res;

+ 1 - 2
vector/v.vol.rst/main.c

@@ -434,8 +434,7 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (G_get_set_window(&cellhd) == -1)
-	G_fatal_error("G_get_set_window() failed");
+    G_get_set_window(&cellhd);
 
     G3d_getWindow(&current_region);
     G3d_readWindow(&current_region, NULL);