projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 1c043bb93d3418a7d0948eafe09107d9397ec64c..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/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>
#include "output/table.h"
#include <cairo/cairo-pdf.h>
@@
-602,15
+603,14
@@
xr_update_page_setup (struct output_driver *driver,
}
static void
}
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);
{
struct xr_driver *xr = xr_driver_cast (driver);
- if (i
s_page_setup_item (output_item)
)
+ if (i
tem->type == OUTPUT_ITEM_PAGE_SETUP
)
{
if (!xr->pager)
{
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;
}
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_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);
while (xr_pager_needs_new_page (xr->pager))
{
xr_finish_page (xr);