diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2018-08-31 18:29:39 +0800 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2018-09-06 20:35:12 +0800 |
| commit | ef5c1f4a8af9f6906b338be29c7b62dccb7c979a (patch) | |
| tree | 43b61692813d4a138939daf3e0d778307f3a72f3 | |
| parent | 0296fd18b836fd70f57c0030054ba2131531ef06 (diff) | |
| download | mupdf-ef5c1f4a8af9f6906b338be29c7b62dccb7c979a.tar.xz | |
Bug 699717: Pop clip even in case of error.
Not popping causes assert to be triggered in fz_draw_end_group().
| -rw-r--r-- | source/pdf/pdf-op-run.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c index 5892dcb8..cce39cf7 100644 --- a/source/pdf/pdf-op-run.c +++ b/source/pdf/pdf-op-run.c @@ -609,10 +609,12 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i int knockout_group = 0; char errmess[256] = ""; int err = FZ_ERROR_NONE; + int innerclip = 0; fz_var(knockout_group); fz_var(bbox); fz_var(path); + fz_var(innerclip); if (dostroke) { if (pr->dev->flags & (FZ_DEVFLAG_STROKECOLOR_UNDEFINED | FZ_DEVFLAG_LINEJOIN_UNDEFINED | FZ_DEVFLAG_LINEWIDTH_UNDEFINED)) @@ -675,17 +677,21 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i if (gstate->fill.pattern) { fz_clip_path(ctx, pr->dev, path, even_odd, gstate->ctm, bbox); + innerclip = 1; gstate = pdf_show_pattern(ctx, pr, gstate->fill.pattern, gstate->fill.gstate_num, bbox, PDF_FILL); fz_pop_clip(ctx, pr->dev); + innerclip = 0; } break; case PDF_MAT_SHADE: if (gstate->fill.shade) { fz_clip_path(ctx, pr->dev, path, even_odd, gstate->ctm, bbox); + innerclip = 1; /* The cluster and page 2 of patterns.pdf shows that fz_fill_shade should NOT be called with gstate->ctm. */ fz_fill_shade(ctx, pr->dev, gstate->fill.shade, pr->gstate[gstate->fill.gstate_num].ctm, gstate->fill.alpha, &gstate->fill.color_params); fz_pop_clip(ctx, pr->dev); + innerclip = 0; } break; } @@ -705,16 +711,20 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i if (gstate->stroke.pattern) { fz_clip_stroke_path(ctx, pr->dev, path, gstate->stroke_state, gstate->ctm, bbox); + innerclip = 1; gstate = pdf_show_pattern(ctx, pr, gstate->stroke.pattern, gstate->stroke.gstate_num, bbox, PDF_STROKE); fz_pop_clip(ctx, pr->dev); + innerclip = 0; } break; case PDF_MAT_SHADE: if (gstate->stroke.shade) { fz_clip_stroke_path(ctx, pr->dev, path, gstate->stroke_state, gstate->ctm, bbox); + innerclip = 1; fz_fill_shade(ctx, pr->dev, gstate->stroke.shade, pr->gstate[gstate->stroke.gstate_num].ctm, gstate->stroke.alpha, &gstate->stroke.color_params); fz_pop_clip(ctx, pr->dev); + innerclip = 0; } break; } @@ -722,6 +732,20 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i } fz_always(ctx) { + if (innerclip) + { + fz_try(ctx) + { + fz_pop_clip(ctx, pr->dev); + } + fz_catch(ctx) + { + /* Postpone the problem */ + err = fz_caught(ctx); + strcpy(errmess, fz_caught_message(ctx)); + } + } + if (knockout_group) { fz_try(ctx) @@ -731,6 +755,8 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i fz_catch(ctx) { /* Postpone the problem */ + if (err) + fz_warn(ctx, "ignoring error: %s", fz_caught_message(ctx)); err = fz_caught(ctx); strcpy(errmess, fz_caught_message(ctx)); } |