[GRASS-SVN] r32550 - grass/trunk/raster/r.colors

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-08-05 20:57:07 -0400 (Tue, 05 Aug 2008)
New Revision: 32550

Modified:
   grass/trunk/raster/r.colors/main.c
Log:
Remove color=rules (redundant; use -i instead)


Modified: grass/trunk/raster/r.colors/main.c
===================================================================
--- grass/trunk/raster/r.colors/main.c	2008-08-05 21:32:52 UTC (rev 32549)
+++ grass/trunk/raster/r.colors/main.c	2008-08-06 00:57:07 UTC (rev 32550)
@@ -41,12 +41,11 @@
 
     rules = G__ls(path, &nrules);
 
-    rules = G_realloc(rules, (nrules + 4) * sizeof(const char *));
+    rules = G_realloc(rules, (nrules + 3) * sizeof(const char *));
 
     rules[nrules++] = G_store("random");
     rules[nrules++] = G_store("grey.eq");
     rules[nrules++] = G_store("grey.log");
-    rules[nrules++] = G_store("rules");
 }
 
 static char *rules_list(void)
@@ -164,7 +163,6 @@
 	  "rainbow;rainbow color table;"
 	  "ramp;color ramp;"
 	  "random;random color table;"
-	  "rules;create new color table based on user-specified rules;"
 	  "ryb;red through yellow to blue colors;"
 	  "ryg;red through yellow to green colors;"
 	  "slope;r.slope.aspect-type slope colors for raster values 0-90;"
@@ -312,10 +310,6 @@
 	    G_make_histogram_log_colors(&colors, &statf, (CELL) min,
 					(CELL) max);
 	}
-	else if (strcmp(style, "rules") == 0) {
-	    if (!read_color_rules(stdin, &colors, min, max, fp))
-		exit(EXIT_FAILURE);
-	}
 	else if (find_rule(style))
 	    G_make_fp_colors(&colors, style, min, max);
 	else