[GRASS-SVN] r38112 - in grass/trunk: include lib/raster raster/r.le/r.le.patch raster/r.resample

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-06-28 16:49:17 -0400 (Sun, 28 Jun 2009)
New Revision: 38112

Modified:
   grass/trunk/include/raster.h
   grass/trunk/lib/raster/color_rand.c
   grass/trunk/lib/raster/color_range.c
   grass/trunk/raster/r.le/r.le.patch/trace.c
   grass/trunk/raster/r.resample/main.c
Log:
rasterlib:  Rast_set_color_range ->  Rast_set_c_color_range


Modified: grass/trunk/include/raster.h
===================================================================
--- grass/trunk/include/raster.h	2009-06-28 20:21:12 UTC (rev 38111)
+++ grass/trunk/include/raster.h	2009-06-28 20:49:17 UTC (rev 38112)
@@ -161,7 +161,7 @@
 void Rast_make_random_colors(struct Colors *, CELL, CELL);
 
 /* color_range.c */
-void Rast_set_color_range(CELL, CELL, struct Colors *);
+void Rast_set_c_color_range(CELL, CELL, struct Colors *);
 void Rast_set_d_color_range(DCELL, DCELL, struct Colors *);
 void Rast_get_c_color_range(CELL *, CELL *, const struct Colors *);
 void Rast_get_d_color_range(DCELL *, DCELL *, const struct Colors *);

Modified: grass/trunk/lib/raster/color_rand.c
===================================================================
--- grass/trunk/lib/raster/color_rand.c	2009-06-28 20:21:12 UTC (rev 38111)
+++ grass/trunk/lib/raster/color_rand.c	2009-06-28 20:49:17 UTC (rev 38112)
@@ -45,5 +45,5 @@
 	blu = rand() & 0377;
 	Rast_add_modular_color_rule(n, red, grn, blu, n, red, grn, blu, colors);
     }
-    Rast_set_color_range(min, max, colors);
+    Rast_set_c_color_range(min, max, colors);
 }

Modified: grass/trunk/lib/raster/color_range.c
===================================================================
--- grass/trunk/lib/raster/color_range.c	2009-06-28 20:21:12 UTC (rev 38111)
+++ grass/trunk/lib/raster/color_range.c	2009-06-28 20:49:17 UTC (rev 38112)
@@ -16,13 +16,11 @@
 
 /*!
   \brief Set color range (CELL version)
-
-  \todo Rename to G_set_c_color_range() ?
-
+  
   \param min,max minimum and maximum value
   \param colors pointer to Colors structure which holds color info
 */
-void Rast_set_color_range(CELL min, CELL max, struct Colors *colors)
+void Rast_set_c_color_range(CELL min, CELL max, struct Colors *colors)
 {
     if (min < max) {
 	colors->cmin = (DCELL) min;
@@ -55,8 +53,6 @@
 /*!
   \brief Get color range values (CELL)
 
-  \todo Rename to G_get_c_color_range() ?
-  
   Returns min and max category in the range or huge numbers if the
   color table is defined on floating cell values and not on
   categories.

Modified: grass/trunk/raster/r.le/r.le.patch/trace.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/trace.c	2009-06-28 20:21:12 UTC (rev 38111)
+++ grass/trunk/raster/r.le/r.le.patch/trace.c	2009-06-28 20:49:17 UTC (rev 38112)
@@ -398,7 +398,7 @@
 		    cmin = min;
 		if (max < cmax)
 		    cmax = max;
-		Rast_set_color_range(cmin, cmax, &colr);
+		Rast_set_c_color_range(cmin, cmax, &colr);
 	    }
 	    else {
 		DCELL dmin, dmax;
@@ -411,7 +411,7 @@
 		    cmin = dmin;
 		if (dmax < cmax)
 		    cmax = dmax;
-		Rast_set_color_range(cmin, cmax, &colr);
+		Rast_set_c_color_range(cmin, cmax, &colr);
 	    }
 	    Rast_write_colors("interior", mapset, &colr);
 	}

Modified: grass/trunk/raster/r.resample/main.c
===================================================================
--- grass/trunk/raster/r.resample/main.c	2009-06-28 20:21:12 UTC (rev 38111)
+++ grass/trunk/raster/r.resample/main.c	2009-06-28 20:49:17 UTC (rev 38112)
@@ -164,7 +164,7 @@
 		cmin = min;
 	    if (max < cmax)
 		cmax = max;
-	    Rast_set_color_range(cmin, cmax, &colr);
+	    Rast_set_c_color_range(cmin, cmax, &colr);
 	}
 	Rast_write_colors(result, G_mapset(), &colr);
     }