[GRASS-SVN] r56367 - grass/trunk/raster/r.walk

svn_grass at osgeo.org svn_grass at osgeo.org
Wed May 22 12:50:30 PDT 2013


Author: mmetz
Date: 2013-05-22 12:50:28 -0700 (Wed, 22 May 2013)
New Revision: 56367

Modified:
   grass/trunk/raster/r.walk/main.c
Log:
r.walk: cumulative costs must be DCELL

Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c	2013-05-22 19:49:48 UTC (rev 56366)
+++ grass/trunk/raster/r.walk/main.c	2013-05-22 19:50:28 UTC (rev 56367)
@@ -480,40 +480,6 @@
     }
     G_debug(1, "COST %d rows, %d cols", cost_cellhd.rows, cost_cellhd.cols);
 
-    if (cost_data_type != dtm_data_type) {
-	switch (cost_data_type) {
-	case (CELL_TYPE):
-	    if (dtm_data_type == FCELL_TYPE)
-		cum_data_type = FCELL_TYPE;
-	    else
-		cum_data_type = DCELL_TYPE;
-	    break;
-	case (FCELL_TYPE):
-	    if (dtm_data_type == DCELL_TYPE)
-		cum_data_type = DCELL_TYPE;
-	    else
-		cum_data_type = FCELL_TYPE;
-	    break;
-	case (DCELL_TYPE):
-	    cum_data_type = DCELL_TYPE;
-	    break;
-	}
-    }
-    else
-	/* Data type are equal, it doesn't matter */
-	cum_data_type = dtm_data_type;
-
-    switch (cum_data_type) {
-    case (CELL_TYPE):
-	G_debug(1, "Output map is: Integer cell type");
-	break;
-    case (FCELL_TYPE):
-	G_debug(1, "Output map is: Floating point (float) cell type");
-	break;
-    case (DCELL_TYPE):
-	G_debug(1, "Output map is: Floating point (double) cell type");
-	break;
-    }
     G_debug(1, " %d rows, %d cols", nrows, ncols);
     G_format_resolution(window.ew_res, buf, window.proj);
     G_debug(1, " EW resolution %s (%lf)", buf, window.ew_res);



More information about the grass-commit mailing list