Browse Source

r.watershed: revert https://trac.osgeo.org/grass/changeset/71614

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@71618 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 7 years ago
parent
commit
150fca60ef
1 changed files with 2 additions and 2 deletions
  1. 2 2
      raster/r.watershed/seg/init_vars.c

+ 2 - 2
raster/r.watershed/seg/init_vars.c

@@ -430,7 +430,7 @@ int init_vars(int argc, char *argv[])
 
 
     G_debug(1, "open segments for A* points");
     G_debug(1, "open segments for A* points");
     /* columns per segment */
     /* 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;
     num_cseg_total = do_points / seg_cols;
     if (do_points % seg_cols > 0)
     if (do_points % seg_cols > 0)
 	num_cseg_total++;
 	num_cseg_total++;
@@ -449,7 +449,7 @@ int init_vars(int argc, char *argv[])
     G_debug(1, "heap memory %.2f MB", heap_mem);
     G_debug(1, "heap memory %.2f MB", heap_mem);
     /* columns per segment */
     /* columns per segment */
     /* larger is faster */
     /* 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;
     num_cseg_total = do_points / seg_cols;
     if (do_points % seg_cols > 0)
     if (do_points % seg_cols > 0)
 	num_cseg_total++;
 	num_cseg_total++;