From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 14 Sep 2014 19:35:53 +0000 (-0700)
Subject: render: Fix bug in render_pager_draw_region().
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=7ee8dbfc15aa4580c2132e53b64f13815fc93c62

render: Fix bug in render_pager_draw_region().

This bug, introduced in commit f1db96caae4 (ender: Fold caption drawing
into rendering engine.), could cause the title and body of a table to be
drawn overlapping.
---

diff --git a/src/output/render.c b/src/output/render.c
index 84eef66795..3ac603527e 100644
--- a/src/output/render.c
+++ b/src/output/render.c
@@ -1599,11 +1599,14 @@ render_pager_draw_region (const struct render_pager *p,
   for (i = 0; i < p->n_pages; i++)
     {
       const struct render_page *page = p->pages[i];
+      int size = render_page_get_size (page, V);
 
       clip[V][0] = MAX (y, ofs[V]) - ofs[V];
-      clip[V][1] = MIN (y + h, ofs[V] + render_page_get_size (page, V)) - ofs[V];
+      clip[V][1] = MIN (y + h, ofs[V] + size) - ofs[V];
       if (clip[V][1] > clip[V][0])
         render_page_draw_region (page, ofs, clip);
+
+      ofs[V] += size;
     }
 }