cairo output works again

[pspp] / src / output / cairo-fsm.c

diff --git a/src/output/cairo-fsm.c b/src/output/cairo-fsm.c
index 73231dba4e0e73addf1650194812cd5ed8e961a2..5d1b63e4f1937780333bbcae6e9e1a538d2e115e 100644 (file)
--- a/src/output/cairo-fsm.c
+++ b/src/output/cairo-fsm.c
@@ -1118,10 +1118,10 @@ xr_fsm_create (const struct output_item *item_,
 
       int char_size[TABLE_N_AXES];
       pango_layout_get_size (layout, &char_size[H], &char_size[V]);
-      for (int j = 0; j < TABLE_N_AXES; j++)
+      for (int a = 0; a < TABLE_N_AXES; a++)
         {
-          int csj = pango_to_xr (char_size[j]);
-          fsm->rp.font_size[j] = MAX (fsm->rp.font_size[j], csj);
+          int csa = pango_to_xr (char_size[a]);
+          fsm->rp.font_size[a] = MAX (fsm->rp.font_size[a], csa);
         }
 
       g_object_unref (G_OBJECT (layout));
@@ -1143,7 +1143,6 @@ xr_fsm_destroy (struct xr_fsm *fsm)
     }
 }
 
-
 /* This is primarily meant for use with screen rendering since the result is a
    fixed value for charts. */
 void
@@ -1175,17 +1174,9 @@ xr_fsm_measure (struct xr_fsm *fsm, cairo_t *cr, int *wp, int *hp)
 static int
 xr_fsm_draw_table (struct xr_fsm *fsm, int space)
 {
-  int used = 0;
-  while (render_pager_has_next (fsm->p))
-    {
-      int chunk = render_pager_draw_next (fsm->p, space - used);
-      if (!chunk)
-        return used;
-
-      used += chunk;
-      cairo_translate (fsm->cairo, 0, chunk);
-    }
-  return used;
+  return (render_pager_has_next (fsm->p)
+          ? render_pager_draw_next (fsm->p, space)
+          : 0);
 }
 
 static int