Просмотр исходного кода

rasterlib: Rast_set_color_range -> Rast_set_c_color_range

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38112 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 16 лет назад
Родитель
Сommit
a5a91680f0

+ 1 - 1
include/raster.h

@@ -161,7 +161,7 @@ void Rast__organize_colors(struct Colors *);
 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 *);

+ 1 - 1
lib/raster/color_rand.c

@@ -45,5 +45,5 @@ void Rast_make_random_colors(struct Colors *colors, CELL min, CELL max)
 	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);
 }

+ 2 - 6
lib/raster/color_range.c

@@ -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 @@ void Rast_set_d_color_range(DCELL min, DCELL max, struct Colors *colors)
 /*!
   \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.

+ 2 - 2
raster/r.le/r.le.patch/trace.c

@@ -398,7 +398,7 @@ void cell_clip_drv(int col0, int row0, int ncols, int nrows, double **value,
 		    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 @@ void cell_clip_drv(int col0, int row0, int ncols, int nrows, double **value,
 		    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);
 	}

+ 1 - 1
raster/r.resample/main.c

@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
 		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);
     }