[GRASS-SVN] r38983 - in grass/branches/develbranch_6/raster: r.neighbors r.resamp.stats

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-09-05 06:35:20 -0400 (Sat, 05 Sep 2009)
New Revision: 38983

Modified:
   grass/branches/develbranch_6/raster/r.neighbors/main.c
   grass/branches/develbranch_6/raster/r.resamp.stats/main.c
Log:
missing closure argument (see e.g. lib/stat/c_ave.c)


Modified: grass/branches/develbranch_6/raster/r.neighbors/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.neighbors/main.c	2009-09-05 10:29:02 UTC (rev 38982)
+++ grass/branches/develbranch_6/raster/r.neighbors/main.c	2009-09-05 10:35:20 UTC (rev 38983)
@@ -316,9 +316,9 @@
 		G_set_d_null_value(rp, 1);
 	    else {
 		if (newvalue_w)
-		    newvalue_w(rp, values_w, n);
+		    newvalue_w(rp, values_w, n, NULL);
 		else
-		    newvalue(rp, values, n);
+		    newvalue(rp, values, n, NULL);
 
 		if (half && !G_is_d_null_value(rp))
 		    *rp += 0.5;

Modified: grass/branches/develbranch_6/raster/r.resamp.stats/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.resamp.stats/main.c	2009-09-05 10:29:02 UTC (rev 38982)
+++ grass/branches/develbranch_6/raster/r.resamp.stats/main.c	2009-09-05 10:35:20 UTC (rev 38983)
@@ -38,7 +38,7 @@
     {c_sum,    w_sum,    "sum",      "sum of values"},
     {c_var,    w_var,    "variance", "variance value"},
     {c_stddev, w_stddev, "stddev",   "standard deviation"},
-    {NULL, NULL, NULL}
+    {NULL, NULL, NULL, NULL}
 };
 
 static char *build_method_list(void)
@@ -141,7 +141,7 @@
 	    if (null && nulls)
 		G_set_d_null_value(&outbuf[col], 1);
 	    else
-		(*method_fn) (&outbuf[col], values, n);
+		(*method_fn) (&outbuf[col], values, n, NULL);
 	}
 
 	G_set_window(&dst_w);
@@ -227,7 +227,7 @@
 	    if (null && nulls)
 		G_set_d_null_value(&outbuf[col], 1);
 	    else
-		(*method_fn) (&outbuf[col], values, n);
+		(*method_fn) (&outbuf[col], values, n, NULL);
 	}
 
 	G_set_window(&dst_w);