output: Move parse_color() from cairo.c to options.c.

[pspp] / src / output / ascii.c

diff --git a/src/output/ascii.c b/src/output/ascii.c
index 8bdcd51d960f62efcc8aa10afd6bdf3ae45f33b4..011c6946c5a6461f2815b6e519648a0e82add8d7 100644 (file)
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -292,8 +292,8 @@ ascii_create (struct  file_handle *fh, enum settings_output_devices device_type,
   a->min_hbreak = parse_int (opt (d, o, "min-hbreak", "-1"), -1, INT_MAX);
 
 #ifdef HAVE_CAIRO
-  parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &a->bg);
-  parse_color (d, o, "foreground-color", "#000000000000", &a->fg);
+  a->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF"));
+  a->fg = parse_color (opt (d, o, "foreground-color", "#000000000000"));
 #endif
 
   const char *default_box = (terminal && (!strcmp (locale_charset (), "UTF-8")