[GRASS-SVN] r40218 - in grass/trunk: imagery/i.atcorr raster/r.terraflow raster/r.walk

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-01-04 11:34:50 -0500 (Mon, 04 Jan 2010)
New Revision: 40218

Modified:
   grass/trunk/imagery/i.atcorr/main.cpp
   grass/trunk/raster/r.terraflow/main.cc
   grass/trunk/raster/r.walk/main.c
Log:
Fix files which were omitted in r40217


Modified: grass/trunk/imagery/i.atcorr/main.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/main.cpp	2010-01-04 15:51:45 UTC (rev 40217)
+++ grass/trunk/imagery/i.atcorr/main.cpp	2010-01-04 16:34:50 UTC (rev 40218)
@@ -96,9 +96,7 @@
 {
     struct Cell_head iimg_head;	/* the input image header file */
 
-    if(Rast_get_cellhd(name, mapset, &iimg_head) < 0) 
-	G_fatal_error (_("Unable to read header of raster map <%s>"),
-		       G_fully_qualified_name(name, mapset));
+    Rast_get_cellhd(name, mapset, &iimg_head);
 
     if(Rast_set_window(&iimg_head) < 0) 
 	G_fatal_error (_("Invalid graphics region coordinates"));

Modified: grass/trunk/raster/r.terraflow/main.cc
===================================================================
--- grass/trunk/raster/r.terraflow/main.cc	2010-01-04 15:51:45 UTC (rev 40217)
+++ grass/trunk/raster/r.terraflow/main.cc	2010-01-04 16:34:50 UTC (rev 40218)
@@ -193,8 +193,7 @@
   }
   /* read cell header */
   struct Cell_head cell_hd;
-  if (Rast_get_cellhd (cellname, mapset, &cell_hd) < 0)
-    G_fatal_error(_("Cannot read header of [%s]"), cellname);
+  Rast_get_cellhd (cellname, mapset, &cell_hd);
   
   /* check compatibility with module region */
   if (!((region->ew_res == cell_hd.ew_res)

Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c	2010-01-04 15:51:45 UTC (rev 40217)
+++ grass/trunk/raster/r.walk/main.c	2010-01-04 16:34:50 UTC (rev 40218)
@@ -180,7 +180,6 @@
 
     /* Definition for dimension and region check */
     struct Cell_head dtm_cellhd, cost_cellhd;
-    int dtm_head_ok, cost_head_ok;
 
     G_gisinit(argv[0]);
 
@@ -544,16 +543,9 @@
     dtm_fd = Rast_open_old(dtm_layer, "");
     cost_fd = Rast_open_old(cost_layer, "");
 
-    dtm_head_ok = Rast_get_cellhd(dtm_layer, "", &dtm_cellhd) >= 0;
-    cost_head_ok = Rast_get_cellhd(cost_layer, "", &cost_cellhd) >= 0;
+    Rast_get_cellhd(dtm_layer, "", &dtm_cellhd);
+    Rast_get_cellhd(cost_layer, "", &cost_cellhd);
 
-    /*Reading headers from maps */
-
-    if (!dtm_head_ok)
-	G_fatal_error(_("Unable to read %s"), dtm_layer);
-    if (!cost_head_ok)
-	G_fatal_error(_("Unable to read %s"), cost_layer);
-
     /*Projection */
 
     if (dtm_cellhd.proj != cost_cellhd.proj)