[GRASS-SVN] r34984 - grass/trunk/raster/r.statistics3

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Dec 21 20:37:46 EST 2008


Author: glynn
Date: 2008-12-21 20:37:46 -0500 (Sun, 21 Dec 2008)
New Revision: 34984

Modified:
   grass/trunk/raster/r.statistics3/main.c
Log:
Rename fmin/fmax to avoid clashes with <math.h>


Modified: grass/trunk/raster/r.statistics3/main.c
===================================================================
--- grass/trunk/raster/r.statistics3/main.c	2008-12-22 00:07:10 UTC (rev 34983)
+++ grass/trunk/raster/r.statistics3/main.c	2008-12-22 01:37:46 UTC (rev 34984)
@@ -40,7 +40,7 @@
 
 static int num_quants;
 static DCELL *quants;
-static DCELL fmin, fmax;
+static DCELL f_min, f_max;
 static int num_slots;
 static DCELL slot_size;
 
@@ -491,8 +491,8 @@
 		      basemap, MAX_CATS);
 
     G_read_fp_range(covermap, "", &fprange);
-    G_get_fp_range_min_max(&fprange, &fmin, &fmax);
-    slot_size = (fmax - fmin) / num_slots;
+    G_get_fp_range_min_max(&fprange, &f_min, &f_max);
+    slot_size = (f_max - f_min) / num_slots;
 
     basecats = G_calloc(num_cats, sizeof(struct basecat));
 



More information about the grass-commit mailing list