diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2017-06-27 16:09:01 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2017-07-21 16:45:53 +0200 |
| commit | 6df51810d3d3b9f47c965ccf2f9a1af49ba0b56f (patch) | |
| tree | d4ffcdc6fed3998ff71c7498ba4b14d65e90dfe1 /source/pdf/pdf-op-run.c | |
| parent | 35e3fcec9332ff096ebcbab5403af999f01a4690 (diff) | |
| download | mupdf-6df51810d3d3b9f47c965ccf2f9a1af49ba0b56f.tar.xz | |
Reuse pattern tiles when running PDF interpreter directly.
Diffstat (limited to 'source/pdf/pdf-op-run.c')
| -rw-r--r-- | source/pdf/pdf-op-run.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c index 48dd9d53..8a0ba446 100644 --- a/source/pdf/pdf-op-run.c +++ b/source/pdf/pdf-op-run.c @@ -360,6 +360,7 @@ pdf_show_pattern(fz_context *ctx, pdf_run_processor *pr, pdf_pattern *pat, pdf_g int x0, y0, x1, y1; float fx0, fy0, fx1, fy1; fz_rect local_area; + int id; pdf_gsave(ctx, pr); gstate = pr->gstate + pr->gtop; @@ -383,11 +384,13 @@ pdf_show_pattern(fz_context *ctx, pdf_run_processor *pr, pdf_pattern *pat, pdf_g pdf_keep_material(ctx, &gstate->stroke); gstate->fill = gstate->stroke; } + id = 0; /* don't cache uncolored patterns, since we colorize them when drawing */ } else { // TODO: unset only the current fill/stroke or both? pdf_unset_pattern(ctx, pr, what); + id = pat->id; } /* don't apply soft masks to objects in the pattern as well */ @@ -437,21 +440,24 @@ pdf_show_pattern(fz_context *ctx, pdf_run_processor *pr, pdf_pattern *pat, pdf_g if (0) #endif { - fz_begin_tile(ctx, pr->dev, &local_area, &pat->bbox, pat->xstep, pat->ystep, &ptm); - gstate->ctm = ptm; - pdf_gsave(ctx, pr); - fz_try(ctx) + int cached = fz_begin_tile_id(ctx, pr->dev, &local_area, &pat->bbox, pat->xstep, pat->ystep, &ptm, id); + if (cached) { - pdf_process_contents(ctx, (pdf_processor*)pr, pat->document, pat->resources, pat->contents, NULL); - } - fz_always(ctx) - { - pdf_grestore(ctx, pr); fz_end_tile(ctx, pr->dev); } - fz_catch(ctx) + else { - fz_rethrow(ctx); + gstate->ctm = ptm; + pdf_gsave(ctx, pr); + fz_try(ctx) + pdf_process_contents(ctx, (pdf_processor*)pr, pat->document, pat->resources, pat->contents, NULL); + fz_always(ctx) + { + pdf_grestore(ctx, pr); + fz_end_tile(ctx, pr->dev); + } + fz_catch(ctx) + fz_rethrow(ctx); } } else |