[GRASS-SVN] r38111 - in grass/trunk: lib/ogsf raster/r.colors.out

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-06-28 16:21:12 -0400 (Sun, 28 Jun 2009)
New Revision: 38111

Modified:
   grass/trunk/lib/ogsf/Gs3.c
   grass/trunk/raster/r.colors.out/main.c
Log:
fix Rast_lookup_c_colors()


Modified: grass/trunk/lib/ogsf/Gs3.c
===================================================================
--- grass/trunk/lib/ogsf/Gs3.c	2009-06-28 19:25:03 UTC (rev 38110)
+++ grass/trunk/lib/ogsf/Gs3.c	2009-06-28 20:21:12 UTC (rev 38111)
@@ -658,7 +658,7 @@
 	cats[i] = i;
     }
 
-    Rast_lookup_colors(cats, r, g, b, set, 256, &colrules);
+    Rast_lookup_c_colors(cats, r, g, b, set, 256, &colrules);
 
     for (i = 0; i < 256; i++) {
 
@@ -710,7 +710,7 @@
     G_message(_("Translating colors from raster map <%s>..."), filename);
 
     for (i = 0; i < rows; i++) {
-	Rast_lookup_colors(cur, r, g, b, set, cols, &colrules);
+	Rast_lookup_c_colors(cur, r, g, b, set, cols, &colrules);
 	G_percent(i, rows, 2);
 
 	for (j = 0; j < cols; j++) {

Modified: grass/trunk/raster/r.colors.out/main.c
===================================================================
--- grass/trunk/raster/r.colors.out/main.c	2009-06-28 19:25:03 UTC (rev 38110)
+++ grass/trunk/raster/r.colors.out/main.c	2009-06-28 20:21:12 UTC (rev 38111)
@@ -108,7 +108,7 @@
 	for (i = lo; i <= hi; i++) {
 	    unsigned char r, g, b, set;
 	    DCELL val = (DCELL) i;
-	    Rast_lookup_colors(&i, &r, &g, &b, &set, 1, &colors);
+	    Rast_lookup_c_colors(&i, &r, &g, &b, &set, 1, &colors);
 	    write_rule(&val, r, g, b);
 	}
     }