projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable GDK3 deprecation warnings.
[pspp]
/
src
/
output
/
cairo.c
diff --git
a/src/output/cairo.c
b/src/output/cairo.c
index 32586f7937922f754cec6c426ece9925980b3682..abef72289cd6219f6d4b300ee2eef969da3ad72a 100644
(file)
--- a/
src/output/cairo.c
+++ b/
src/output/cairo.c
@@
-267,7
+267,7
@@
apply_options (struct xr_driver *xr, struct string_map *o)
xr->fonts[XR_FONT_EMPHASIS].desc = parse_font (d, o, "emph-font",
"serif italic", font_points);
xr->fonts[XR_FONT_EMPHASIS].desc = parse_font (d, o, "emph-font",
"serif italic", font_points);
- xr->line_gutter =
XR_POINT
;
+ xr->line_gutter =
parse_dimension (opt (d, o, "gutter", "3pt"))
;
xr->line_space = XR_POINT;
xr->line_width = XR_POINT / 2;
xr->page_number = 0;
xr->line_space = XR_POINT;
xr->line_width = XR_POINT / 2;
xr->page_number = 0;
@@
-1028,11
+1028,9
@@
xr_rendering_measure (struct xr_rendering *r, int *w, int *h)
static void xr_draw_chart (const struct chart_item *, cairo_t *,
double x, double y, double width, double height);
static void xr_draw_chart (const struct chart_item *, cairo_t *,
double x, double y, double width, double height);
-/* Draws onto CR at least the region of R that is enclosed in (X,Y)-(X+W,Y+H),
- and possibly some additional parts. */
+/* Draws onto CR */
void
void
-xr_rendering_draw (struct xr_rendering *r, cairo_t *cr,
- int x, int y, int w, int h)
+xr_rendering_draw_all (struct xr_rendering *r, cairo_t *cr)
{
if (is_table_item (r->item))
{
{
if (is_table_item (r->item))
{
@@
-1048,9
+1046,7
@@
xr_rendering_draw (struct xr_rendering *r, cairo_t *cr,
}
xr->y = r->title_height;
}
xr->y = r->title_height;
- render_page_draw_region (r->page,
- x * XR_POINT, (y * XR_POINT) - r->title_height,
- w * XR_POINT, h * XR_POINT);
+ render_page_draw (r->page);
}
else
xr_draw_chart (to_chart_item (r->item), cr,
}
else
xr_draw_chart (to_chart_item (r->item), cr,