[GRASS-SVN] r71619 - grass/branches/releasebranch_7_2/raster/r.watershed/seg

[svn_grass at osgeo.org]

Author: mmetz
Date: 2017-10-31 12:07:34 -0700 (Tue, 31 Oct 2017)
New Revision: 71619

Modified:
   grass/branches/releasebranch_7_2/raster/r.watershed/seg/init_vars.c
Log:
r.watershed: revert r71615

Modified: grass/branches/releasebranch_7_2/raster/r.watershed/seg/init_vars.c
===================================================================
--- grass/branches/releasebranch_7_2/raster/r.watershed/seg/init_vars.c	2017-10-31 19:06:19 UTC (rev 71618)
+++ grass/branches/releasebranch_7_2/raster/r.watershed/seg/init_vars.c	2017-10-31 19:07:34 UTC (rev 71619)
@@ -430,7 +430,7 @@
 
     G_debug(1, "open segments for A* points");
     /* columns per segment */
-    seg_cols = seg_rows * 200; /* check for integer overflow ? */
+    seg_cols = seg_rows * seg_rows;
     num_cseg_total = do_points / seg_cols;
     if (do_points % seg_cols > 0)
 	num_cseg_total++;
@@ -449,7 +449,7 @@
     G_debug(1, "heap memory %.2f MB", heap_mem);
     /* columns per segment */
     /* larger is faster */
-    seg_cols = seg_rows * 300; /* check for integer overflow ? */
+    seg_cols = seg_rows * seg_rows * seg_rows;
     num_cseg_total = do_points / seg_cols;
     if (do_points % seg_cols > 0)
 	num_cseg_total++;