output-item: Collapse the inheritance hierarchy into a single struct.

[pspp] / src / output / cairo.c

diff --git a/src/output/cairo.c b/src/output/cairo.c
index 0aa35b66cc69d8fc3aaf8200d71aa337e8b12116..e5ac93bcf0635a63d5c0d094fd39dbc62f647cc1 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>
@@ -254,7 +255,6 @@ xr_allocate (const char *name, int device_type,
     },
 
     .initial_page_number = 1,
-    .object_spacing = object_spacing,
     .include_outline = include_outline,
   };
 
@@ -266,6 +266,7 @@ xr_allocate (const char *name, int device_type,
     .font = font,
     .fg = fg,
     .use_system_colors = systemcolors,
+    .object_spacing = object_spacing,
     .font_resolution = font_resolution,
   };
 
@@ -574,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++)
@@ -593,6 +593,7 @@ xr_update_page_setup (struct output_driver *driver,
     .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,
   };
   xr_fsm_style_unref (old_fs);
@@ -602,15 +603,14 @@ 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 (item->type == OUTPUT_ITEM_PAGE_SETUP)
     {
       if (!xr->pager)
-        xr_update_page_setup (driver,
-                              to_page_setup_item (output_item)->page_setup);
+        xr_update_page_setup (driver, item->page_setup);
       return;
     }
 
@@ -620,7 +620,7 @@ xr_submit (struct output_driver *driver, const struct output_item *output_item)
       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);