output-item: Fix memory leak in output_item_dump().

[pspp] / src / output / cairo.c

diff --git a/src/output/cairo.c b/src/output/cairo.c
index 313456c663e07290efb5a88f3104741c8df35d33..a08771bb449ae68cb2d0d126c3c439a0e2907395 100644 (file)
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -26,6 +26,7 @@
 #include "output/cairo-pager.h"
 #include "output/driver-provider.h"
 #include "output/options.h"
+#include "output/output-item.h"
 #include "output/table.h"
 
 #include <cairo/cairo-pdf.h>
@@ -186,7 +187,7 @@ static struct xr_driver *
 xr_allocate (const char *name, int device_type,
              enum xr_output_type output_type, struct string_map *o)
 {
-  struct xr_driver *xr = xzalloc (sizeof *xr);
+  struct xr_driver *xr = XZALLOC (struct xr_driver);
   struct output_driver *d = &xr->driver;
 
   output_driver_init (d, &cairo_driver_class, name, device_type);
@@ -218,10 +219,8 @@ xr_allocate (const char *name, int device_type,
       min_break[a] = size[a] / 2;
 
   int font_size = parse_int (opt (d, o, "font-size", "10000"), 1000, 1000000);
-  PangoFontDescription *fixed_font = parse_font_option
-    (d, o, "fixed-font", "monospace", font_size, false, false);
-  PangoFontDescription *proportional_font = parse_font_option (
-    d, o, "prop-font", "sans serif", font_size, false, false);
+  PangoFontDescription *font = parse_font_option (
+    d, o, "prop-font", "Sans Serif", font_size, false, false);
 
   struct cell_color fg = parse_color (opt (d, o, "foreground-color", "black"));
 
@@ -256,7 +255,6 @@ xr_allocate (const char *name, int device_type,
     },
 
     .initial_page_number = 1,
-    .object_spacing = object_spacing,
     .include_outline = include_outline,
   };
 
@@ -265,12 +263,10 @@ xr_allocate (const char *name, int device_type,
     .ref_cnt = 1,
     .size = { [H] = size[H], [V] = size[V] },
     .min_break = { [H] = min_break[H], [V] = min_break[V] },
-    .fonts = {
-      [XR_FONT_PROPORTIONAL] = proportional_font,
-      [XR_FONT_FIXED] = fixed_font,
-    },
+    .font = font,
     .fg = fg,
     .use_system_colors = systemcolors,
+    .object_spacing = object_spacing,
     .font_resolution = font_resolution,
   };
 
@@ -579,7 +575,6 @@ xr_update_page_setup (struct output_driver *driver,
     },
 
     .initial_page_number = setup->initial_page_number,
-    .object_spacing = setup->object_spacing * 72 * XR_POINT,
     .include_outline = old_ps->include_outline,
   };
   for (size_t i = 0; i < 2; i++)
@@ -595,12 +590,12 @@ xr_update_page_setup (struct output_driver *driver,
       [H] = setup->paper[H] * scale / 2,
       [V] = setup->paper[V] * scale / 2,
     },
+    .font = pango_font_description_copy (old_fs->font),
     .fg = old_fs->fg,
     .use_system_colors = old_fs->use_system_colors,
+    .object_spacing = setup->object_spacing * 72 * XR_POINT,
     .font_resolution = old_fs->font_resolution,
   };
-  for (size_t i = 0; i < XR_N_FONTS; i++)
-    xr->fsm_style->fonts[i] = pango_font_description_copy (old_fs->fonts[i]);
   xr_fsm_style_unref (old_fs);
 
   xr_set_surface_size (xr->dest_surface, xr->output_type,
@@ -608,31 +603,32 @@ xr_update_page_setup (struct output_driver *driver,
 }
 
 static void
-xr_submit (struct output_driver *driver, const struct output_item *output_item)
+xr_submit (struct output_driver *driver, const struct output_item *item)
 {
   struct xr_driver *xr = xr_driver_cast (driver);
 
-  if (is_page_setup_item (output_item))
-    {
-      if (!xr->pager)
-        xr_update_page_setup (driver,
-                              to_page_setup_item (output_item)->page_setup);
-      return;
-    }
-
   if (!xr->pager)
     {
       xr->pager = xr_pager_create (xr->page_style, xr->fsm_style);
       xr_pager_add_page (xr->pager, cairo_create (xr->drawing_surface));
     }
 
-  xr_pager_add_item (xr->pager, output_item);
+  xr_pager_add_item (xr->pager, item);
   while (xr_pager_needs_new_page (xr->pager))
     {
       xr_finish_page (xr);
       xr_pager_add_page (xr->pager, cairo_create (xr->drawing_surface));
     }
 }
+
+static void
+xr_setup (struct output_driver *driver, const struct page_setup *ps)
+{
+  struct xr_driver *xr = xr_driver_cast (driver);
+
+  if (!xr->pager)
+    xr_update_page_setup (driver, ps);
+}
 \f
 struct output_driver_factory pdf_driver_factory =
   { "pdf", "pspp.pdf", xr_pdf_create };
@@ -645,8 +641,9 @@ struct output_driver_factory png_driver_factory =
 
 static const struct output_driver_class cairo_driver_class =
 {
-  "cairo",
-  xr_destroy,
-  xr_submit,
-  NULL,
+  .name = "cairo",
+  .destroy = xr_destroy,
+  .submit = xr_submit,
+  .setup = xr_setup,
+  .handles_groups = true,
 };