From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 2 Jan 2019 06:07:47 +0000 (-0800)
Subject: cairo: Make xr_rendering_measure() tolerate NULL arguments.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=21687be9c3a1205a7f221d74bb88b0acbb900633

cairo: Make xr_rendering_measure() tolerate NULL arguments.
---

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 *,