From 51291360b4047986cc2608166b924d79c5497c6e Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Sun, 8 Nov 2015 14:27:55 +0000 Subject: [PATCH] Merge pull request #5432 from mdboom/fix-segfault-in-text-drawing Don't draw text when it's completely clipped away --- src/_backend_agg.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/_backend_agg.h b/src/_backend_agg.h index 0249b3f4f13a..83311a6d8538 100644 --- a/src/_backend_agg.h +++ b/src/_backend_agg.h @@ -788,9 +788,11 @@ inline void RendererAgg::draw_text_image(GCAgg &gc, ImageArray &image, int x, in text.clip(clip); } - for (int yi = text.y1; yi < text.y2; ++yi) { - pixFmt.blend_solid_hspan(text.x1, yi, (text.x2 - text.x1), gc.color, - &image(yi - (y - image.dim(0)), text.x1 - x)); + if (text.x2 > text.x1) { + for (int yi = text.y1; yi < text.y2; ++yi) { + pixFmt.blend_solid_hspan(text.x1, yi, (text.x2 - text.x1), gc.color, + &image(yi - (y - image.dim(0)), text.x1 - x)); + } } } }