[GRASS-SVN] r46749 - grass-addons/display/d.barb

[svn_grass at osgeo.org]

Author: hamish
Date: 2011-06-20 13:54:02 -0700 (Mon, 20 Jun 2011)
New Revision: 46749

Modified:
   grass-addons/display/d.barb/draw.c
   grass-addons/display/d.barb/grid.c
   grass-addons/display/d.barb/legend.c
Log:
fix RGB color support

Modified: grass-addons/display/d.barb/draw.c
===================================================================
--- grass-addons/display/d.barb/draw.c	2011-06-20 15:09:00 UTC (rev 46748)
+++ grass-addons/display/d.barb/draw.c	2011-06-20 20:54:02 UTC (rev 46749)
@@ -15,7 +15,7 @@
 
     //dbg:    unknown_(594578,4920392);
 
-    R_standard_color(color);
+    D_raster_use_color(color);
 
     R_move_abs((int)(D_u_to_d_col(easting) + 0.5),
 	       (int)(D_u_to_d_row(northing) + 0.5));

Modified: grass-addons/display/d.barb/grid.c
===================================================================
--- grass-addons/display/d.barb/grid.c	2011-06-20 15:09:00 UTC (rev 46748)
+++ grass-addons/display/d.barb/grid.c	2011-06-20 20:54:02 UTC (rev 46749)
@@ -156,7 +156,7 @@
 	    if (G_is_null_value(dir_u_ptr, dir_u_raster_type))
 		continue;
 
-	    R_standard_color(color);
+	    D_raster_use_color(color);
 
 	    easting = G_col_to_easting(col + 0.5, &window);
 	    northing = G_row_to_northing(row + 0.5, &window);
@@ -176,7 +176,7 @@
 	    else {
 		R_standard_color(D_parse_color("grey", 0));
 		unknown_(easting, northing);
-		R_standard_color(color);
+		D_raster_use_color(color);
 	    }
 
 	    dir_u_ptr =

Modified: grass-addons/display/d.barb/legend.c
===================================================================
--- grass-addons/display/d.barb/legend.c	2011-06-20 15:09:00 UTC (rev 46748)
+++ grass-addons/display/d.barb/legend.c	2011-06-20 20:54:02 UTC (rev 46749)
@@ -46,8 +46,7 @@
 	G_debug(5, "  (aka east=%.2f  north=%2.f)", easting, northing);
 	G_debug(5, "  (aka pixelX=%d  pixelY=%d)", Xpx, Ypx);
 
-
-	R_standard_color(color);
+	D_raster_use_color(color);
 	sprintf(buff, "%s", velo_list[i]);
 
 	/* Y: center justify: */