diff options
Diffstat (limited to 'source/pdf')
-rw-r--r-- | source/pdf/pdf-device.c | 68 | ||||
-rw-r--r-- | source/pdf/pdf-link.c | 6 | ||||
-rw-r--r-- | source/pdf/pdf-op-filter.c | 4 | ||||
-rw-r--r-- | source/pdf/pdf-op-run.c | 79 | ||||
-rw-r--r-- | source/pdf/pdf-page.c | 2 | ||||
-rw-r--r-- | source/pdf/pdf-run.c | 30 | ||||
-rw-r--r-- | source/pdf/pdf-shade.c | 8 | ||||
-rw-r--r-- | source/pdf/pdf-type3.c | 2 |
8 files changed, 98 insertions, 101 deletions
diff --git a/source/pdf/pdf-device.c b/source/pdf/pdf-device.c index 4358508e..97621b49 100644 --- a/source/pdf/pdf-device.c +++ b/source/pdf/pdf-device.c @@ -200,16 +200,16 @@ pdf_dev_path(fz_context *ctx, pdf_device *pdev, const fz_path *path) } static void -pdf_dev_ctm(fz_context *ctx, pdf_device *pdev, const fz_matrix *ctm) +pdf_dev_ctm(fz_context *ctx, pdf_device *pdev, fz_matrix ctm) { fz_matrix inverse; gstate *gs = CURRENT_GSTATE(pdev); - if (memcmp(&gs->ctm, ctm, sizeof(*ctm)) == 0) + if (memcmp(&gs->ctm, &ctm, sizeof(ctm)) == 0) return; inverse = fz_invert_matrix(gs->ctm); - inverse = fz_concat(*ctm, inverse); - gs->ctm = *ctm; + inverse = fz_concat(ctm, inverse); + gs->ctm = ctm; fz_append_printf(ctx, gs->buf, "%M cm\n", &inverse); } @@ -503,7 +503,7 @@ pdf_dev_trm(fz_context *ctx, pdf_device *pdev, int trm) } static void -pdf_dev_begin_text(fz_context *ctx, pdf_device *pdev, const fz_matrix *tm, int trm) +pdf_dev_begin_text(fz_context *ctx, pdf_device *pdev, fz_matrix tm, int trm) { pdf_dev_trm(ctx, pdev, trm); if (!pdev->in_text) @@ -631,7 +631,7 @@ pdf_dev_new_form(fz_context *ctx, pdf_obj **form_ref, pdf_device *pdev, const fz /* Entry points */ static void -pdf_dev_fill_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, const fz_matrix *ctm, +pdf_dev_fill_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, fz_matrix ctm, fz_colorspace *colorspace, const float *color, float alpha, const fz_color_params *color_params) { pdf_device *pdev = (pdf_device*)dev; @@ -646,7 +646,7 @@ pdf_dev_fill_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even } static void -pdf_dev_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_stroke_state *stroke, const fz_matrix *ctm, +pdf_dev_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_stroke_state *stroke, fz_matrix ctm, fz_colorspace *colorspace, const float *color, float alpha, const fz_color_params *color_params) { pdf_device *pdev = (pdf_device*)dev; @@ -662,7 +662,7 @@ pdf_dev_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const } static void -pdf_dev_clip_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, const fz_matrix *ctm, const fz_rect *scissor) +pdf_dev_clip_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, fz_matrix ctm, const fz_rect *scissor) { pdf_device *pdev = (pdf_device*)dev; gstate *gs; @@ -676,7 +676,7 @@ pdf_dev_clip_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even } static void -pdf_dev_clip_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_stroke_state *stroke, const fz_matrix *ctm, const fz_rect *scissor) +pdf_dev_clip_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_stroke_state *stroke, fz_matrix ctm, const fz_rect *scissor) { pdf_device *pdev = (pdf_device*)dev; gstate *gs; @@ -694,7 +694,7 @@ pdf_dev_clip_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, c } static void -pdf_dev_fill_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_matrix *ctm, +pdf_dev_fill_text(fz_context *ctx, fz_device *dev, const fz_text *text, fz_matrix ctm, fz_colorspace *colorspace, const float *color, float alpha, const fz_color_params *color_params) { pdf_device *pdev = (pdf_device*)dev; @@ -703,7 +703,7 @@ pdf_dev_fill_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz for (span = text->head; span; span = span->next) { fz_matrix trm = span->trm; - pdf_dev_begin_text(ctx, pdev, &trm, 0); + pdf_dev_begin_text(ctx, pdev, trm, 0); pdf_dev_font(ctx, pdev, span->font); pdf_dev_ctm(ctx, pdev, ctm); pdf_dev_alpha(ctx, pdev, alpha, 0); @@ -713,7 +713,7 @@ pdf_dev_fill_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz } static void -pdf_dev_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *stroke, const fz_matrix *ctm, +pdf_dev_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *stroke, fz_matrix ctm, fz_colorspace *colorspace, const float *color, float alpha, const fz_color_params *color_params) { pdf_device *pdev = (pdf_device*)dev; @@ -721,7 +721,7 @@ pdf_dev_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const for (span = text->head; span; span = span->next) { - pdf_dev_begin_text(ctx, pdev, &span->trm, 1); + pdf_dev_begin_text(ctx, pdev, span->trm, 1); pdf_dev_font(ctx, pdev, span->font); pdf_dev_ctm(ctx, pdev, ctm); pdf_dev_alpha(ctx, pdev, alpha, 1); @@ -731,13 +731,13 @@ pdf_dev_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const } static void -pdf_dev_clip_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_matrix *ctm, const fz_rect *scissor) +pdf_dev_clip_text(fz_context *ctx, fz_device *dev, const fz_text *text, fz_matrix ctm, const fz_rect *scissor) { pdf_device *pdev = (pdf_device*)dev; fz_text_span *span; for (span = text->head; span; span = span->next) { - pdf_dev_begin_text(ctx, pdev, &span->trm, 0); + pdf_dev_begin_text(ctx, pdev, span->trm, 0); pdf_dev_ctm(ctx, pdev, ctm); pdf_dev_font(ctx, pdev, span->font); pdf_dev_text_span(ctx, pdev, span); @@ -745,13 +745,13 @@ pdf_dev_clip_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz } static void -pdf_dev_clip_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *stroke, const fz_matrix *ctm, const fz_rect *scissor) +pdf_dev_clip_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *stroke, fz_matrix ctm, const fz_rect *scissor) { pdf_device *pdev = (pdf_device*)dev; fz_text_span *span; for (span = text->head; span; span = span->next) { - pdf_dev_begin_text(ctx, pdev, &span->trm, 0); + pdf_dev_begin_text(ctx, pdev, span->trm, 0); pdf_dev_font(ctx, pdev, span->font); pdf_dev_ctm(ctx, pdev, ctm); pdf_dev_text_span(ctx, pdev, span); @@ -759,13 +759,13 @@ pdf_dev_clip_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, c } static void -pdf_dev_ignore_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_matrix *ctm) +pdf_dev_ignore_text(fz_context *ctx, fz_device *dev, const fz_text *text, fz_matrix ctm) { pdf_device *pdev = (pdf_device*)dev; fz_text_span *span; for (span = text->head; span; span = span->next) { - pdf_dev_begin_text(ctx, pdev, &span->trm, 0); + pdf_dev_begin_text(ctx, pdev, span->trm, 0); pdf_dev_ctm(ctx, pdev, ctm); pdf_dev_font(ctx, pdev, span->font); pdf_dev_text_span(ctx, pdev, span); @@ -805,12 +805,11 @@ pdf_dev_add_image_res(fz_context *ctx, fz_device *dev, pdf_obj *im_res) } static void -pdf_dev_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, float alpha, const fz_color_params *color_params) +pdf_dev_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, fz_matrix ctm, float alpha, const fz_color_params *color_params) { pdf_device *pdev = (pdf_device*)dev; pdf_obj *im_res; gstate *gs = CURRENT_GSTATE(pdev); - fz_matrix local_ctm = *ctm; pdf_dev_end_text(ctx, pdev); im_res = pdf_add_image(ctx, pdev->doc, image, 0); @@ -822,9 +821,9 @@ pdf_dev_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_ma pdf_dev_alpha(ctx, pdev, alpha, 0); /* PDF images are upside down, so fiddle the ctm */ - local_ctm = fz_pre_scale(local_ctm, 1, -1); - local_ctm = fz_pre_translate(local_ctm, 0, -1); - pdf_dev_ctm(ctx, pdev, &local_ctm); + ctm = fz_pre_scale(ctm, 1, -1); + ctm = fz_pre_translate(ctm, 0, -1); + pdf_dev_ctm(ctx, pdev, ctm); fz_append_printf(ctx, gs->buf, "/Img%d Do\n", pdf_to_num(ctx, im_res)); /* Possibly add to page resources */ @@ -833,7 +832,7 @@ pdf_dev_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_ma } static void -pdf_dev_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_matrix *ctm, float alpha, const fz_color_params *color_params) +pdf_dev_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, fz_matrix ctm, float alpha, const fz_color_params *color_params) { pdf_device *pdev = (pdf_device*)dev; @@ -842,13 +841,12 @@ pdf_dev_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_ma } static void -pdf_dev_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, +pdf_dev_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, fz_matrix ctm, fz_colorspace *colorspace, const float *color, float alpha, const fz_color_params *color_params) { pdf_device *pdev = (pdf_device*)dev; pdf_obj *im_res = NULL; gstate *gs = CURRENT_GSTATE(pdev); - fz_matrix local_ctm = *ctm; pdf_dev_end_text(ctx, pdev); im_res = pdf_add_image(ctx, pdev->doc, image, 1); @@ -862,9 +860,9 @@ pdf_dev_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const pdf_dev_color(ctx, pdev, colorspace, color, 0, color_params); /* PDF images are upside down, so fiddle the ctm */ - local_ctm = fz_pre_scale(local_ctm, 1, -1); - local_ctm = fz_pre_translate(local_ctm, 0, -1); - pdf_dev_ctm(ctx, pdev, &local_ctm); + ctm = fz_pre_scale(ctm, 1, -1); + ctm = fz_pre_translate(ctm, 0, -1); + pdf_dev_ctm(ctx, pdev, ctm); fz_append_printf(ctx, gs->buf, "/Img%d Do Q\n", pdf_to_num(ctx, im_res)); /* Possibly add to page resources */ @@ -873,7 +871,7 @@ pdf_dev_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const } static void -pdf_dev_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, const fz_rect *scissor) +pdf_dev_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, fz_matrix ctm, const fz_rect *scissor) { pdf_device *pdev = (pdf_device*)dev; @@ -1031,7 +1029,7 @@ pdf_dev_end_group(fz_context *ctx, fz_device *dev) } static int -pdf_dev_begin_tile(fz_context *ctx, fz_device *dev, const fz_rect *area, const fz_rect *view, float xstep, float ystep, const fz_matrix *ctm, int id) +pdf_dev_begin_tile(fz_context *ctx, fz_device *dev, const fz_rect *area, const fz_rect *view, float xstep, float ystep, fz_matrix ctm, int id) { pdf_device *pdev = (pdf_device*)dev; @@ -1080,7 +1078,7 @@ pdf_dev_drop_device(fz_context *ctx, fz_device *dev) fz_free(ctx, pdev->gstates); } -fz_device *pdf_new_pdf_device(fz_context *ctx, pdf_document *doc, const fz_matrix *topctm, const fz_rect *mediabox, pdf_obj *resources, fz_buffer *buf) +fz_device *pdf_new_pdf_device(fz_context *ctx, pdf_document *doc, fz_matrix topctm, const fz_rect *mediabox, pdf_obj *resources, fz_buffer *buf) { pdf_device *dev = fz_new_derived_device(ctx, pdf_device); @@ -1133,7 +1131,7 @@ fz_device *pdf_new_pdf_device(fz_context *ctx, pdf_document *doc, const fz_matri dev->num_gstates = 1; dev->max_gstates = 1; - if (topctm != &fz_identity) + if (!fz_is_identity(topctm)) fz_append_printf(ctx, buf, "%M cm\n", topctm); } fz_catch(ctx) @@ -1153,5 +1151,5 @@ fz_device *pdf_page_write(fz_context *ctx, pdf_document *doc, fz_matrix pagectm = { 1, 0, 0, -1, -mediabox->x0, mediabox->y1 }; *presources = pdf_new_dict(ctx, doc, 0); *pcontents = fz_new_buffer(ctx, 0); - return pdf_new_pdf_device(ctx, doc, &pagectm, mediabox, *presources, *pcontents); + return pdf_new_pdf_device(ctx, doc, pagectm, mediabox, *presources, *pcontents); } diff --git a/source/pdf/pdf-link.c b/source/pdf/pdf-link.c index 6fe6f334..ae5beaa3 100644 --- a/source/pdf/pdf-link.c +++ b/source/pdf/pdf-link.c @@ -239,7 +239,7 @@ pdf_parse_link_action(fz_context *ctx, pdf_document *doc, pdf_obj *action, int p } static fz_link * -pdf_load_link(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int pagenum, const fz_matrix *page_ctm) +pdf_load_link(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int pagenum, fz_matrix page_ctm) { pdf_obj *action; pdf_obj *obj; @@ -256,7 +256,7 @@ pdf_load_link(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int pagenum, co return NULL; bbox = pdf_to_rect(ctx, obj); - bbox = fz_transform_rect(bbox, *page_ctm); + bbox = fz_transform_rect(bbox, page_ctm); obj = pdf_dict_get(ctx, dict, PDF_NAME(Dest)); if (obj) @@ -284,7 +284,7 @@ pdf_load_link(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int pagenum, co } fz_link * -pdf_load_link_annots(fz_context *ctx, pdf_document *doc, pdf_obj *annots, int pagenum, const fz_matrix *page_ctm) +pdf_load_link_annots(fz_context *ctx, pdf_document *doc, pdf_obj *annots, int pagenum, fz_matrix page_ctm) { fz_link *link, *head, *tail; pdf_obj *obj; diff --git a/source/pdf/pdf-op-filter.c b/source/pdf/pdf-op-filter.c index 10138cda..145dbfe2 100644 --- a/source/pdf/pdf-op-filter.c +++ b/source/pdf/pdf-op-filter.c @@ -436,7 +436,7 @@ filter_show_char(fz_context *ctx, pdf_filter_processor *p, int cid) } if (p->text_filter) - remove = p->text_filter(ctx, p->opaque, ucsbuf, ucslen, &trm, &p->tos.char_bbox); + remove = p->text_filter(ctx, p->opaque, ucsbuf, ucslen, trm, p->tos.char_bbox); pdf_tos_move_after_char(ctx, &p->tos); @@ -1040,7 +1040,7 @@ pdf_filter_ET(fz_context *ctx, pdf_processor *proc) fz_matrix ctm = fz_concat(p->gstate->sent.ctm, p->gstate->pending.ctm); if (p->chain->op_q) p->chain->op_q(ctx, p->chain); - p->after_text(ctx, p->opaque, p->doc, p->chain, &ctm); + p->after_text(ctx, p->opaque, p->doc, p->chain, ctm); if (p->chain->op_Q) p->chain->op_Q(ctx, p->chain); } diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c index 61729f0c..b08657a6 100644 --- a/source/pdf/pdf-op-run.c +++ b/source/pdf/pdf-op-run.c @@ -13,7 +13,7 @@ typedef struct pdf_material_s pdf_material; typedef struct pdf_run_processor_s pdf_run_processor; -static void pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_obj *xobj, pdf_obj *page_resources, const fz_matrix *transform, int is_smask); +static void pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_obj *xobj, pdf_obj *page_resources, fz_matrix transform, int is_smask); enum { @@ -140,7 +140,7 @@ begin_softmask(fz_context *ctx, pdf_run_processor *pr, softmask_save *save) fz_try(ctx) { fz_begin_mask(ctx, pr->dev, &mask_bbox, gstate->luminosity, mask_colorspace, gstate->softmask_bc, &gstate->fill.color_params); - pdf_run_xobject(ctx, pr, softmask, save->page_resources, &fz_identity, 1); + pdf_run_xobject(ctx, pr, softmask, save->page_resources, fz_identity, 1); } fz_always(ctx) fz_drop_colorspace(ctx, mask_colorspace); @@ -214,7 +214,7 @@ pdf_show_shade(fz_context *ctx, pdf_run_processor *pr, fz_shade *shd) /* FIXME: The gstate->ctm in the next line may be wrong; maybe * it should be the parent gstates ctm? */ - fz_fill_shade(ctx, pr->dev, shd, &gstate->ctm, gstate->fill.alpha, &gstate->fill.color_params); + fz_fill_shade(ctx, pr->dev, shd, gstate->ctm, gstate->fill.alpha, &gstate->fill.color_params); pdf_end_group(ctx, pr, &softmask); } @@ -428,7 +428,7 @@ pdf_show_pattern(fz_context *ctx, pdf_run_processor *pr, pdf_pattern *pat, pdf_g if (0) #endif { - int cached = fz_begin_tile_id(ctx, pr->dev, &local_area, &pat->bbox, pat->xstep, pat->ystep, &ptm, id); + int cached = fz_begin_tile_id(ctx, pr->dev, &local_area, &pat->bbox, pat->xstep, pat->ystep, ptm, id); if (cached) { fz_end_tile(ctx, pr->dev); @@ -499,7 +499,7 @@ pdf_show_pattern(fz_context *ctx, pdf_run_processor *pr, pdf_pattern *pat, pdf_g } static void -pdf_show_image_imp(fz_context *ctx, pdf_run_processor *pr, fz_image *image, fz_matrix *image_ctm, fz_rect *bbox) +pdf_show_image_imp(fz_context *ctx, pdf_run_processor *pr, fz_image *image, fz_matrix image_ctm, fz_rect *bbox) { pdf_gstate *gstate = pr->gstate + pr->gtop; @@ -526,7 +526,7 @@ pdf_show_image_imp(fz_context *ctx, pdf_run_processor *pr, fz_image *image, fz_m { fz_clip_image_mask(ctx, pr->dev, image, image_ctm, bbox); fz_try(ctx) - fz_fill_shade(ctx, pr->dev, gstate->fill.shade, &pr->gstate[gstate->fill.gstate_num].ctm, gstate->fill.alpha, &gstate->fill.color_params); + fz_fill_shade(ctx, pr->dev, gstate->fill.shade, pr->gstate[gstate->fill.gstate_num].ctm, gstate->fill.alpha, &gstate->fill.color_params); fz_always(ctx) fz_pop_clip(ctx, pr->dev); fz_catch(ctx) @@ -555,7 +555,7 @@ pdf_show_image(fz_context *ctx, pdf_run_processor *pr, fz_image *image) fz_begin_group(ctx, pr->dev, &bbox, NULL, 0, 0, gstate->blendmode, 1); fz_try(ctx) - fz_clip_image_mask(ctx, pr->dev, image->mask, &image_ctm, &bbox); + fz_clip_image_mask(ctx, pr->dev, image->mask, image_ctm, &bbox); fz_catch(ctx) { fz_end_group(ctx, pr->dev); @@ -563,7 +563,7 @@ pdf_show_image(fz_context *ctx, pdf_run_processor *pr, fz_image *image) } fz_try(ctx) - pdf_show_image_imp(ctx, pr, image, &image_ctm, &bbox); + pdf_show_image_imp(ctx, pr, image, image_ctm, &bbox); fz_always(ctx) { fz_pop_clip(ctx, pr->dev); @@ -574,9 +574,9 @@ pdf_show_image(fz_context *ctx, pdf_run_processor *pr, fz_image *image) } else if (image->mask) { - fz_clip_image_mask(ctx, pr->dev, image->mask, &image_ctm, &bbox); + fz_clip_image_mask(ctx, pr->dev, image->mask, image_ctm, &bbox); fz_try(ctx) - pdf_show_image_imp(ctx, pr, image, &image_ctm, &bbox); + pdf_show_image_imp(ctx, pr, image, image_ctm, &bbox); fz_always(ctx) fz_pop_clip(ctx, pr->dev); fz_catch(ctx) @@ -589,7 +589,7 @@ pdf_show_image(fz_context *ctx, pdf_run_processor *pr, fz_image *image) gstate = pdf_begin_group(ctx, pr, &bbox, &softmask); fz_try(ctx) - pdf_show_image_imp(ctx, pr, image, &image_ctm, &bbox); + pdf_show_image_imp(ctx, pr, image, image_ctm, &bbox); fz_always(ctx) pdf_end_group(ctx, pr, &softmask); fz_catch(ctx) @@ -660,13 +660,13 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i case PDF_MAT_NONE: break; case PDF_MAT_COLOR: - fz_fill_path(ctx, pr->dev, path, even_odd, &gstate->ctm, + fz_fill_path(ctx, pr->dev, path, even_odd, gstate->ctm, gstate->fill.colorspace, gstate->fill.v, gstate->fill.alpha, &gstate->fill.color_params); break; case PDF_MAT_PATTERN: if (gstate->fill.pattern) { - fz_clip_path(ctx, pr->dev, path, even_odd, &gstate->ctm, &bbox); + fz_clip_path(ctx, pr->dev, path, even_odd, gstate->ctm, &bbox); pdf_show_pattern(ctx, pr, gstate->fill.pattern, &pr->gstate[gstate->fill.gstate_num], &bbox, PDF_FILL); fz_pop_clip(ctx, pr->dev); } @@ -674,9 +674,9 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i case PDF_MAT_SHADE: if (gstate->fill.shade) { - fz_clip_path(ctx, pr->dev, path, even_odd, &gstate->ctm, &bbox); + fz_clip_path(ctx, pr->dev, path, even_odd, gstate->ctm, &bbox); /* 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_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); } break; @@ -690,13 +690,13 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i case PDF_MAT_NONE: break; case PDF_MAT_COLOR: - fz_stroke_path(ctx, pr->dev, path, gstate->stroke_state, &gstate->ctm, + fz_stroke_path(ctx, pr->dev, path, gstate->stroke_state, gstate->ctm, gstate->stroke.colorspace, gstate->stroke.v, gstate->stroke.alpha, &gstate->stroke.color_params); break; case PDF_MAT_PATTERN: if (gstate->stroke.pattern) { - fz_clip_stroke_path(ctx, pr->dev, path, gstate->stroke_state, &gstate->ctm, &bbox); + fz_clip_stroke_path(ctx, pr->dev, path, gstate->stroke_state, gstate->ctm, &bbox); pdf_show_pattern(ctx, pr, gstate->stroke.pattern, &pr->gstate[gstate->stroke.gstate_num], &bbox, PDF_STROKE); fz_pop_clip(ctx, pr->dev); } @@ -704,8 +704,8 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i case PDF_MAT_SHADE: if (gstate->stroke.shade) { - fz_clip_stroke_path(ctx, pr->dev, path, gstate->stroke_state, &gstate->ctm, &bbox); - fz_fill_shade(ctx, pr->dev, gstate->stroke.shade, &pr->gstate[gstate->stroke.gstate_num].ctm, gstate->stroke.alpha, &gstate->stroke.color_params); + fz_clip_stroke_path(ctx, pr->dev, path, gstate->stroke_state, gstate->ctm, &bbox); + 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); } break; @@ -722,7 +722,7 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i { gstate = pr->gstate + pr->gtop; /* in case it was changed by pdf_begin_group */ gstate->clip_depth++; - fz_clip_path(ctx, pr->dev, path, pr->clip_even_odd, &gstate->ctm, &bbox); + fz_clip_path(ctx, pr->dev, path, pr->clip_even_odd, gstate->ctm, &bbox); pr->clip = 0; } } @@ -804,7 +804,7 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) } if (doinvisible) - fz_ignore_text(ctx, pr->dev, text, &gstate->ctm); + fz_ignore_text(ctx, pr->dev, text, gstate->ctm); if (dofill) { @@ -813,13 +813,13 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) case PDF_MAT_NONE: break; case PDF_MAT_COLOR: - fz_fill_text(ctx, pr->dev, text, &gstate->ctm, + fz_fill_text(ctx, pr->dev, text, gstate->ctm, gstate->fill.colorspace, gstate->fill.v, gstate->fill.alpha, &gstate->fill.color_params); break; case PDF_MAT_PATTERN: if (gstate->fill.pattern) { - fz_clip_text(ctx, pr->dev, text, &gstate->ctm, &tb); + fz_clip_text(ctx, pr->dev, text, gstate->ctm, &tb); pdf_show_pattern(ctx, pr, gstate->fill.pattern, &pr->gstate[gstate->fill.gstate_num], &tb, PDF_FILL); fz_pop_clip(ctx, pr->dev); } @@ -827,9 +827,9 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) case PDF_MAT_SHADE: if (gstate->fill.shade) { - fz_clip_text(ctx, pr->dev, text, &gstate->ctm, &tb); + fz_clip_text(ctx, pr->dev, text, gstate->ctm, &tb); /* 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_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); } break; @@ -843,13 +843,13 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) case PDF_MAT_NONE: break; case PDF_MAT_COLOR: - fz_stroke_text(ctx, pr->dev, text, gstate->stroke_state, &gstate->ctm, + fz_stroke_text(ctx, pr->dev, text, gstate->stroke_state, gstate->ctm, gstate->stroke.colorspace, gstate->stroke.v, gstate->stroke.alpha, &gstate->stroke.color_params); break; case PDF_MAT_PATTERN: if (gstate->stroke.pattern) { - fz_clip_stroke_text(ctx, pr->dev, text, gstate->stroke_state, &gstate->ctm, &tb); + fz_clip_stroke_text(ctx, pr->dev, text, gstate->stroke_state, gstate->ctm, &tb); pdf_show_pattern(ctx, pr, gstate->stroke.pattern, &pr->gstate[gstate->stroke.gstate_num], &tb, PDF_STROKE); fz_pop_clip(ctx, pr->dev); } @@ -857,8 +857,8 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) case PDF_MAT_SHADE: if (gstate->stroke.shade) { - fz_clip_stroke_text(ctx, pr->dev, text, gstate->stroke_state, &gstate->ctm, &tb); - fz_fill_shade(ctx, pr->dev, gstate->stroke.shade, &pr->gstate[gstate->stroke.gstate_num].ctm, gstate->stroke.alpha, &gstate->stroke.color_params); + fz_clip_stroke_text(ctx, pr->dev, text, gstate->stroke_state, gstate->ctm, &tb); + 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); } break; @@ -874,7 +874,7 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) if (doclip) { gstate->clip_depth++; - fz_clip_text(ctx, pr->dev, text, &gstate->ctm, &tb); + fz_clip_text(ctx, pr->dev, text, gstate->ctm, &tb); } } fz_always(ctx) @@ -920,7 +920,7 @@ pdf_show_char(fz_context *ctx, pdf_run_processor *pr, int cid) * type3 glyphs that seem to inherit current graphics * attributes, or type 3 glyphs within type3 glyphs). */ fz_matrix composed = fz_concat(trm, gstate->ctm); - fz_render_t3_glyph_direct(ctx, pr->dev, fontdesc->font, gid, &composed, gstate, pr->nested_depth, pr->default_cs); + fz_render_t3_glyph_direct(ctx, pr->dev, fontdesc->font, gid, composed, gstate, pr->nested_depth, pr->default_cs); /* Render text invisibly so that it can still be extracted. */ pr->tos.text_mode = 3; } @@ -1036,9 +1036,9 @@ pdf_show_text(fz_context *ctx, pdf_run_processor *pr, pdf_obj *text) */ static void -pdf_init_gstate(fz_context *ctx, pdf_gstate *gs, const fz_matrix *ctm) +pdf_init_gstate(fz_context *ctx, pdf_gstate *gs, fz_matrix ctm) { - gs->ctm = *ctm; + gs->ctm = ctm; gs->clip_depth = 0; gs->stroke_state = fz_new_stroke_state(ctx); @@ -1184,13 +1184,12 @@ pdf_set_pattern(fz_context *ctx, pdf_run_processor *pr, int what, pdf_pattern *p } static void -pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_obj *xobj, pdf_obj *page_resources, const fz_matrix *transform, int is_smask) +pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_obj *xobj, pdf_obj *page_resources, fz_matrix transform, int is_smask) { pdf_run_processor *pr = (pdf_run_processor *)proc; pdf_gstate *gstate = NULL; int oldtop = 0; int oldbot = -1; - fz_matrix local_transform = *transform; softmask_save softmask = { NULL }; int gparent_save; fz_matrix gparent_save_ctm; @@ -1230,8 +1229,8 @@ pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_obj *xobj, pdf_obj transparency = pdf_xobject_transparency(ctx, xobj); /* apply xobject's transform matrix */ - local_transform = fz_concat(xobj_matrix, local_transform); - gstate->ctm = fz_concat(local_transform, gstate->ctm); + transform = fz_concat(xobj_matrix, transform); + gstate->ctm = fz_concat(transform, gstate->ctm); /* The gparent is updated with the modified ctm */ gparent_save_ctm = pr->gstate[pr->gparent].ctm; @@ -1994,7 +1993,7 @@ static void pdf_run_Do_image(fz_context *ctx, pdf_processor *proc, const char *n static void pdf_run_Do_form(fz_context *ctx, pdf_processor *proc, const char *name, pdf_obj *xobj, pdf_obj *page_resources) { - pdf_run_xobject(ctx, (pdf_run_processor*)proc, xobj, page_resources, &fz_identity, 0); + pdf_run_xobject(ctx, (pdf_run_processor*)proc, xobj, page_resources, fz_identity, 0); } /* marked content */ @@ -2081,7 +2080,7 @@ pdf_drop_run_processor(fz_context *ctx, pdf_processor *proc) } pdf_processor * -pdf_new_run_processor(fz_context *ctx, fz_device *dev, const fz_matrix *ctm, const char *usage, pdf_gstate *gstate, int nested, fz_default_colorspaces *default_cs) +pdf_new_run_processor(fz_context *ctx, fz_device *dev, fz_matrix ctm, const char *usage, pdf_gstate *gstate, int nested, fz_default_colorspaces *default_cs) { pdf_run_processor *proc = pdf_new_processor(ctx, sizeof *proc); { @@ -2238,7 +2237,7 @@ pdf_new_run_processor(fz_context *ctx, fz_device *dev, const fz_matrix *ctm, con { pdf_copy_gstate(ctx, &proc->gstate[0], gstate); proc->gstate[0].clip_depth = 0; - proc->gstate[0].ctm = *ctm; + proc->gstate[0].ctm = ctm; } proc->gtop = 0; proc->gbot = 0; diff --git a/source/pdf/pdf-page.c b/source/pdf/pdf-page.c index f8131b2c..3d2c46a0 100644 --- a/source/pdf/pdf-page.c +++ b/source/pdf/pdf-page.c @@ -1082,7 +1082,7 @@ pdf_load_page(fz_context *ctx, pdf_document *doc, int number) fz_rect page_mediabox; fz_matrix page_ctm; pdf_page_transform(ctx, page, &page_mediabox, &page_ctm); - page->links = pdf_load_link_annots(ctx, doc, obj, number, &page_ctm); + page->links = pdf_load_link_annots(ctx, doc, obj, number, page_ctm); pdf_load_annots(ctx, page, obj); } } diff --git a/source/pdf/pdf-run.c b/source/pdf/pdf-run.c index 15339373..ae936253 100644 --- a/source/pdf/pdf-run.c +++ b/source/pdf/pdf-run.c @@ -2,9 +2,9 @@ #include "mupdf/pdf.h" static void -pdf_run_annot_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, pdf_annot *annot, fz_device *dev, const fz_matrix *ctm, const char *usage, fz_cookie *cookie) +pdf_run_annot_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, pdf_annot *annot, fz_device *dev, fz_matrix ctm, const char *usage, fz_cookie *cookie) { - fz_matrix local_ctm, page_ctm; + fz_matrix page_ctm; fz_rect mediabox; pdf_processor *proc = NULL; fz_default_colorspaces *default_cs; @@ -16,11 +16,11 @@ pdf_run_annot_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, pdf fz_set_default_colorspaces(ctx, dev, default_cs); pdf_page_transform(ctx, page, &mediabox, &page_ctm); - local_ctm = fz_concat(page_ctm, *ctm); + ctm = fz_concat(page_ctm, ctm); fz_try(ctx) { - proc = pdf_new_run_processor(ctx, dev, &local_ctm, usage, NULL, 0, default_cs); + proc = pdf_new_run_processor(ctx, dev, ctm, usage, NULL, 0, default_cs); pdf_process_annot(ctx, proc, doc, page, annot, cookie); pdf_close_processor(ctx, proc); } @@ -34,9 +34,9 @@ pdf_run_annot_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, pdf } static void -pdf_run_page_contents_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_device *dev, const fz_matrix *ctm, const char *usage, fz_cookie *cookie) +pdf_run_page_contents_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_device *dev, fz_matrix ctm, const char *usage, fz_cookie *cookie) { - fz_matrix local_ctm, page_ctm; + fz_matrix page_ctm; pdf_obj *resources; pdf_obj *contents; fz_rect mediabox; @@ -54,8 +54,8 @@ pdf_run_page_contents_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *p fz_try(ctx) { pdf_page_transform(ctx, page, &mediabox, &page_ctm); - local_ctm = fz_concat(page_ctm, *ctm); - mediabox = fz_transform_rect(mediabox, local_ctm); + ctm = fz_concat(page_ctm, ctm); + mediabox = fz_transform_rect(mediabox, ctm); resources = pdf_page_resources(ctx, page); contents = pdf_page_contents(ctx, page); @@ -83,7 +83,7 @@ pdf_run_page_contents_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *p colorspace = NULL; } - proc = pdf_new_run_processor(ctx, dev, &local_ctm, usage, NULL, 0, default_cs); + proc = pdf_new_run_processor(ctx, dev, ctm, usage, NULL, 0, default_cs); pdf_process_contents(ctx, proc, doc, resources, contents, cookie); pdf_close_processor(ctx, proc); } @@ -102,7 +102,7 @@ pdf_run_page_contents_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *p fz_end_group(ctx, dev); } -void pdf_run_page_contents(fz_context *ctx, pdf_page *page, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie) +void pdf_run_page_contents(fz_context *ctx, pdf_page *page, fz_device *dev, fz_matrix ctm, fz_cookie *cookie) { pdf_document *doc = page->doc; int nocache; @@ -128,7 +128,7 @@ void pdf_run_page_contents(fz_context *ctx, pdf_page *page, fz_device *dev, cons fz_throw(ctx, FZ_ERROR_TRYLATER, "incomplete rendering"); } -void pdf_run_annot(fz_context *ctx, pdf_annot *annot, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie) +void pdf_run_annot(fz_context *ctx, pdf_annot *annot, fz_device *dev, fz_matrix ctm, fz_cookie *cookie) { pdf_page *page = annot->page; pdf_document *doc = page->doc; @@ -155,7 +155,7 @@ void pdf_run_annot(fz_context *ctx, pdf_annot *annot, fz_device *dev, const fz_m } static void -pdf_run_page_annots_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_device *dev, const fz_matrix *ctm, const char *usage, fz_cookie *cookie) +pdf_run_page_annots_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_device *dev, fz_matrix ctm, const char *usage, fz_cookie *cookie) { pdf_annot *annot; @@ -182,7 +182,7 @@ pdf_run_page_annots_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *pag } void -pdf_run_page_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_device *dev, const fz_matrix *ctm, const char *usage, fz_cookie *cookie) +pdf_run_page_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_device *dev, fz_matrix ctm, const char *usage, fz_cookie *cookie) { int nocache = !!(dev->hints & FZ_NO_CACHE); @@ -207,14 +207,14 @@ pdf_run_page_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_d } void -pdf_run_page(fz_context *ctx, pdf_page *page, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie) +pdf_run_page(fz_context *ctx, pdf_page *page, fz_device *dev, fz_matrix ctm, fz_cookie *cookie) { pdf_document *doc = page->doc; pdf_run_page_with_usage(ctx, doc, page, dev, ctm, "View", cookie); } void -pdf_run_glyph(fz_context *ctx, pdf_document *doc, pdf_obj *resources, fz_buffer *contents, fz_device *dev, const fz_matrix *ctm, void *gstate, int nested_depth, fz_default_colorspaces *default_cs) +pdf_run_glyph(fz_context *ctx, pdf_document *doc, pdf_obj *resources, fz_buffer *contents, fz_device *dev, fz_matrix ctm, void *gstate, int nested_depth, fz_default_colorspaces *default_cs) { pdf_processor *proc; diff --git a/source/pdf/pdf-shade.c b/source/pdf/pdf-shade.c index d34e8440..13c1ebc8 100644 --- a/source/pdf/pdf-shade.c +++ b/source/pdf/pdf-shade.c @@ -293,7 +293,7 @@ pdf_load_type7_shade(fz_context *ctx, pdf_document *doc, fz_shade *shade, pdf_ob /* Load all of the shading dictionary parameters, then switch on the shading type. */ static fz_shade * -pdf_load_shading_dict(fz_context *ctx, pdf_document *doc, pdf_obj *dict, const fz_matrix *transform) +pdf_load_shading_dict(fz_context *ctx, pdf_document *doc, pdf_obj *dict, fz_matrix transform) { fz_shade *shade = NULL; pdf_function *func[FZ_MAX_COLORS] = { NULL }; @@ -314,7 +314,7 @@ pdf_load_shading_dict(fz_context *ctx, pdf_document *doc, pdf_obj *dict, const f shade->type = FZ_MESH_TYPE4; shade->use_background = 0; shade->use_function = 0; - shade->matrix = *transform; + shade->matrix = transform; shade->bbox = fz_infinite_rect; shade->colorspace = NULL; @@ -458,13 +458,13 @@ pdf_load_shading(fz_context *ctx, pdf_document *doc, pdf_obj *dict) if (!obj) fz_throw(ctx, FZ_ERROR_SYNTAX, "missing shading dictionary"); - shade = pdf_load_shading_dict(ctx, doc, obj, &mat); + shade = pdf_load_shading_dict(ctx, doc, obj, mat); } /* Naked shading dictionary */ else { - shade = pdf_load_shading_dict(ctx, doc, dict, &fz_identity); + shade = pdf_load_shading_dict(ctx, doc, dict, fz_identity); } pdf_store_item(ctx, dict, shade, fz_shade_size(ctx, shade)); diff --git a/source/pdf/pdf-type3.c b/source/pdf/pdf-type3.c index 9d32797e..d88d687a 100644 --- a/source/pdf/pdf-type3.c +++ b/source/pdf/pdf-type3.c @@ -4,7 +4,7 @@ #include "../fitz/font-imp.h" static void -pdf_run_glyph_func(fz_context *ctx, void *doc, void *rdb, fz_buffer *contents, fz_device *dev, const fz_matrix *ctm, void *gstate, int nested_depth, fz_default_colorspaces *default_cs) +pdf_run_glyph_func(fz_context *ctx, void *doc, void *rdb, fz_buffer *contents, fz_device *dev, fz_matrix ctm, void *gstate, int nested_depth, fz_default_colorspaces *default_cs) { pdf_run_glyph(ctx, doc, (pdf_obj *)rdb, contents, dev, ctm, gstate, nested_depth, default_cs); } |