[GRASS-SVN] r59678 - grass/branches/releasebranch_7_0/raster/r.neighbors

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-04-10 12:04:47 -0700 (Thu, 10 Apr 2014)
New Revision: 59678

Modified:
   grass/branches/releasebranch_7_0/raster/r.neighbors/main.c
Log:
r.neighbors: Fix r59669; weights= implies non-integer result

Modified: grass/branches/releasebranch_7_0/raster/r.neighbors/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.neighbors/main.c	2014-04-10 18:39:31 UTC (rev 59677)
+++ grass/branches/releasebranch_7_0/raster/r.neighbors/main.c	2014-04-10 19:04:47 UTC (rev 59678)
@@ -323,8 +323,8 @@
 	    : 0;
 	out->buf = Rast_allocate_d_buf();
 	out->fd = Rast_open_new(output_name,
-				menu[method].is_int ? CELL_TYPE : DCELL_TYPE);
-    /* TODO: method=mode should propagate its type */
+				(menu[method].is_int && !out->method_fn_w) ? CELL_TYPE : DCELL_TYPE);
+	/* TODO: method=mode should propagate its type */
 
 	/* get title, initialize the category and stat info */
 	if (parm.title->answer)