projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output: Replace OUTPUT_ITEM_PAGE_SETUP by a new driver function.
[pspp]
/
src
/
output
/
cairo.c
diff --git
a/src/output/cairo.c
b/src/output/cairo.c
index 81aeddc15f4094b4ed88511605323b3007f1bd54..dc5cf94ca3cbf1115835b68d19bcd4993c4cce78 100644
(file)
--- a/
src/output/cairo.c
+++ b/
src/output/cairo.c
@@
-607,13
+607,6
@@
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 (item->type == OUTPUT_ITEM_PAGE_SETUP)
- {
- if (!xr->pager)
- xr_update_page_setup (driver, item->page_setup);
- return;
- }
-
if (!xr->pager)
{
xr->pager = xr_pager_create (xr->page_style, xr->fsm_style);
if (!xr->pager)
{
xr->pager = xr_pager_create (xr->page_style, xr->fsm_style);
@@
-627,6
+620,15
@@
xr_submit (struct output_driver *driver, const struct output_item *item)
xr_pager_add_page (xr->pager, cairo_create (xr->drawing_surface));
}
}
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 };
\f
struct output_driver_factory pdf_driver_factory =
{ "pdf", "pspp.pdf", xr_pdf_create };
@@
-642,5
+644,6
@@
static const struct output_driver_class cairo_driver_class =
.name = "cairo",
.destroy = xr_destroy,
.submit = xr_submit,
.name = "cairo",
.destroy = xr_destroy,
.submit = xr_submit,
+ .setup = xr_setup,
.handles_groups = true,
};
.handles_groups = true,
};