[GRASS-SVN] r34205 - grass/branches/develbranch_6/raster/r.terraflow

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Nov 9 11:39:33 EST 2008


Author: neteler
Date: 2008-11-09 11:39:33 -0500 (Sun, 09 Nov 2008)
New Revision: 34205

Modified:
   grass/branches/develbranch_6/raster/r.terraflow/main.cc
Log:
glynn: Call G_parser() before other libgis functions (merge from trunk, r34198)

Modified: grass/branches/develbranch_6/raster/r.terraflow/main.cc
===================================================================
--- grass/branches/develbranch_6/raster/r.terraflow/main.cc	2008-11-09 16:35:14 UTC (rev 34204)
+++ grass/branches/develbranch_6/raster/r.terraflow/main.cc	2008-11-09 16:39:33 UTC (rev 34205)
@@ -472,6 +472,13 @@
   module->description = _("Flow computation for massive grids (Float version).");
 #endif
 
+  /* read user options; fill in global <opt> */
+  opt = (userOptions*)malloc(sizeof(userOptions));
+  assert(opt);
+
+  parse_args(argc, argv);
+  check_args();
+
   /* get the current region and dimensions */  
   region = (struct Cell_head*)malloc(sizeof(struct Cell_head));
   assert(region);
@@ -488,13 +495,6 @@
     ncols = (dimension_type)nc;
   }
 
-  /* read user options; fill in global <opt> */  
-  opt = (userOptions*)malloc(sizeof(userOptions));
-  assert(opt);
-  
-  parse_args(argc, argv);
-  check_args();
-
   G_verbose_message( _("Region size is %d x %d"), nrows, ncols);
  
   /* check STREAM path (the place where intermediate STREAMs are placed) */



More information about the grass-commit mailing list