[GRASS-SVN] r36846 - grass/branches/releasebranch_6_4/raster/r.topidx

[svn_grass at osgeo.org]

Author: neteler
Date: 2009-04-21 10:31:33 -0400 (Tue, 21 Apr 2009)
New Revision: 36846

Modified:
   grass/branches/releasebranch_6_4/raster/r.topidx/file_io.c
   grass/branches/releasebranch_6_4/raster/r.topidx/main.c
Log:
remove superfluous braces + include; code indentation

Modified: grass/branches/releasebranch_6_4/raster/r.topidx/file_io.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.topidx/file_io.c	2009-04-21 14:31:24 UTC (rev 36845)
+++ grass/branches/releasebranch_6_4/raster/r.topidx/file_io.c	2009-04-21 14:31:33 UTC (rev 36846)
@@ -16,7 +16,7 @@
 	G_fatal_error(_("Cannot open raster map <%s>"), iname);
 
     data_type = G_get_raster_map_type(fd);
-    if (G_get_cellhd(iname, mapset, &inhead) < 0 )
+    if (G_get_cellhd(iname, mapset, &inhead) < 0)
 	G_fatal_error(_("Unable to read header of raster map <%s>"), iname);
 
     if (data_type == CELL_TYPE)
@@ -28,8 +28,10 @@
     atb = (DCELL **) G_malloc(sizeof(DCELL *) * window.rows);
     a = (DCELL **) G_malloc(sizeof(DCELL *) * window.rows);
 
-    if ((window.ew_res < inhead.ew_res) || (window.ns_res < inhead.ns_res))
-        G_fatal_error(_("Current region resolution [%.2fx%.2f] lower than input map resolution [%.2fx%.2f]! Needs to be at least identical or the current region resolution lower than the input map resolution"),window.ew_res, window.ns_res, inhead.ew_res, inhead.ns_res);
+    if (window.ew_res < inhead.ew_res || window.ns_res < inhead.ns_res)
+	G_fatal_error(_("Current region resolution [%.2fx%.2f] lower than input map resolution [%.2fx%.2f]! Needs to be at least identical or the current region resolution lower than the input map resolution"),
+		      window.ew_res, window.ns_res, inhead.ew_res,
+		      inhead.ns_res);
 
     G_important_message(_("Reading elevation map..."));
 

Modified: grass/branches/releasebranch_6_4/raster/r.topidx/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.topidx/main.c	2009-04-21 14:31:24 UTC (rev 36845)
+++ grass/branches/releasebranch_6_4/raster/r.topidx/main.c	2009-04-21 14:31:33 UTC (rev 36846)
@@ -19,7 +19,6 @@
  *****************************************************************************/
 
 #define	MAIN
-#include <grass/gis.h>
 #include <grass/glocale.h>
 #include "global.h"