From d0724c562bb7ae6ad81eb89b064d59a73685f3a8 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Wed, 7 Dec 2011 17:58:00 +0000 Subject: Fix tile coverage calculations. The code attempts to spot cases where a pattern tile is so large that only 1 repeat is visible. Due to rounding errors, this test could sometimes fail, and (on badly formed files) we'd attempt to allocate huge pixmaps. The fix is to allow for rounding errors. --- draw/draw_device.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'draw') diff --git a/draw/draw_device.c b/draw/draw_device.c index 7e40ef3f..cb6760ea 100644 --- a/draw/draw_device.c +++ b/draw/draw_device.c @@ -1437,6 +1437,11 @@ fz_draw_begin_tile(fz_device *devp, fz_rect area, fz_rect view, float xstep, flo fz_knockout_begin(dev); bbox = fz_round_rect(fz_transform_rect(ctm, view)); + /* We should never have a bbox that entirely covers our destination. + * If we do, then the check for only 1 tile being visible above has + * failed. */ + assert(bbox.x0 > dev->dest->x || bbox.x1 < dev->dest->x + dev->dest->w || + bbox.y0 > dev->dest->y || bbox.y1 < dev->dest->y + dev->dest->h); dest = fz_new_pixmap_with_rect(dev->ctx, model, bbox); /* FIXME: See note #1 */ fz_clear_pixmap(dest); -- cgit v1.2.3