From 21687be9c3a1205a7f221d74bb88b0acbb900633 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 1 Jan 2019 22:07:47 -0800 Subject: [PATCH] cairo: Make xr_rendering_measure() tolerate NULL arguments. --- src/output/cairo.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/output/cairo.c b/src/output/cairo.c index 975779bfa9..b0915dc583 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -1648,18 +1648,25 @@ xr_rendering_destroy (struct xr_rendering *r) } void -xr_rendering_measure (struct xr_rendering *r, int *w, int *h) +xr_rendering_measure (struct xr_rendering *r, int *wp, int *hp) { + int w, h; + if (is_table_item (r->item)) { - *w = render_pager_get_size (r->p, H) / XR_POINT; - *h = render_pager_get_size (r->p, V) / XR_POINT; + w = render_pager_get_size (r->p, H) / XR_POINT; + h = render_pager_get_size (r->p, V) / XR_POINT; } else { - *w = CHART_WIDTH; - *h = CHART_HEIGHT; + w = CHART_WIDTH; + h = CHART_HEIGHT; } + + if (wp) + *wp = w; + if (hp) + *hp = h; } static void xr_draw_chart (const struct chart_item *, cairo_t *, -- 2.30.2