[GRASS-SVN] r40214 - grass/branches/develbranch_6/display/d.text.new

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-01-04 08:58:39 -0500 (Mon, 04 Jan 2010)
New Revision: 40214

Modified:
   grass/branches/develbranch_6/display/d.text.new/main.c
Log:
bgcolor=none should disable drawing of background

Modified: grass/branches/develbranch_6/display/d.text.new/main.c
===================================================================
--- grass/branches/develbranch_6/display/d.text.new/main.c	2010-01-04 13:53:10 UTC (rev 40213)
+++ grass/branches/develbranch_6/display/d.text.new/main.c	2010-01-04 13:58:39 UTC (rev 40214)
@@ -326,12 +326,14 @@
 	size = (int)(atof(opt.size->answer) / 100.0 * (win.b - win.t));
 #endif
 
-    fg_color = D_parse_color(opt.fgcolor->answer, 1);
+    fg_color = D_parse_color(opt.fgcolor->answer, TRUE);
     if (opt.bgcolor->answer) {
-       do_background = 1;
-       bg_color = D_parse_color(opt.bgcolor->answer, 1);
+	do_background = 1;
+	bg_color = D_parse_color(opt.bgcolor->answer, TRUE);
+	if (bg_color == 0) /* ie color="none" */
+	    do_background = 0;
     } else
-       do_background = 0;
+	do_background = 0;
     set_color(opt.fgcolor->answer);
 
     orig_x = orig_y = 0;