pivot-table: Tolerate nulls in pivot_value_clone().

[pspp] / src / output / cairo-pager.h

diff --git a/src/output/cairo-pager.h b/src/output/cairo-pager.h
index ab843ee30e6973d1585f303622253640d27e5526..d492ba6933dfbbf98bbc865a656d4e4171a0c550 100644 (file)
--- a/src/output/cairo-pager.h
+++ b/src/output/cairo-pager.h
@@ -19,8 +19,6 @@
 
 #include <stdbool.h>
 
-#ifdef HAVE_CAIRO
-
 /* Cairo output driver paginater. */
 
 #include <cairo/cairo.h>
@@ -37,9 +35,11 @@ struct xr_page_style
 
     struct page_heading headings[2]; /* Top and bottom headings. */
 
-    struct cell_color bg;            /* Background color. */
     int initial_page_number;
-    int object_spacing;
+
+    /* Whether to include an outline in PDF output.  (The only reason I know to
+       omit it is to avoid a Cairo bug that caused crashes in some cases.) */
+    bool include_outline;
   };
 struct xr_page_style *xr_page_style_ref (const struct xr_page_style *);
 struct xr_page_style *xr_page_style_unshare (struct xr_page_style *);
@@ -64,8 +64,7 @@ void xr_pager_add_item (struct xr_pager *, const struct output_item *);
 
 bool xr_pager_has_page (const struct xr_pager *);
 void xr_pager_add_page (struct xr_pager *, cairo_t *);
+void xr_pager_finish_page (struct xr_pager *);
 bool xr_pager_needs_new_page (struct xr_pager *);
 
-#endif  /* HAVE_CAIRO */
-
 #endif /* output/cairo-pager.h */