Merge master into output branch.

[pspp] / src / output / cairo.c

diff --git a/src/output/cairo.c b/src/output/cairo.c
index b8fc486e89e66e1fe218e9543e31eb43b4afe3d9..b0b4f7d3e1fe0dd0be16577171e21faccc3f4c2c 100644 (file)
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -389,8 +389,8 @@ handle_option (void *options_, const char *key, const struct string *val)
     {
     case -1:
       error (0, 0,
-             _("unknown configuration parameter `%s' for Cairo device "
-               "driver"), key);
+             _("unknown configuration parameter `%s' for %s device "
+               "driver"), key, this->class->name);
       break;
     case output_file_arg:
       free (options->file_name);
@@ -518,7 +518,7 @@ xr_output_chart (struct outp_driver *this, const struct chart *chart)
   chart_geometry_init (x->cairo, &geom,
                        xr_to_pt (this->width), xr_to_pt (this->length));
   chart_draw (chart, x->cairo, &geom);
-  chart_geometry_free (x->cairo);
+  chart_geometry_free (x->cairo, &geom);
   cairo_restore (x->cairo);
 
   outp_close_page (this);