From f40106ac6b7367292432ee7af61608548d490e8c Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Fri, 29 Jun 2018 17:26:27 +0200 Subject: Pass rects by value: device and document interface. --- source/pdf/pdf-device.c | 27 ++++++++++---------- source/pdf/pdf-op-run.c | 66 ++++++++++++++++++++++++------------------------- source/pdf/pdf-run.c | 2 +- source/pdf/pdf-write.c | 6 ++--- 4 files changed, 50 insertions(+), 51 deletions(-) (limited to 'source/pdf') diff --git a/source/pdf/pdf-device.c b/source/pdf/pdf-device.c index 97621b49..8d079689 100644 --- a/source/pdf/pdf-device.c +++ b/source/pdf/pdf-device.c @@ -526,7 +526,7 @@ pdf_dev_end_text(fz_context *ctx, pdf_device *pdev) } static int -pdf_dev_new_form(fz_context *ctx, pdf_obj **form_ref, pdf_device *pdev, const fz_rect *bbox, int isolated, int knockout, float alpha, fz_colorspace *colorspace) +pdf_dev_new_form(fz_context *ctx, pdf_obj **form_ref, pdf_device *pdev, fz_rect bbox, int isolated, int knockout, float alpha, fz_colorspace *colorspace) { pdf_document *doc = pdev->doc; int num; @@ -605,7 +605,7 @@ pdf_dev_new_form(fz_context *ctx, pdf_obj **form_ref, pdf_device *pdev, const fz pdf_dict_put(ctx, form, PDF_NAME(Subtype), PDF_NAME(Form)); pdf_dict_put(ctx, form, PDF_NAME(Group), group_ref); pdf_dict_put_int(ctx, form, PDF_NAME(FormType), 1); - pdf_dict_put_rect(ctx, form, PDF_NAME(BBox), *bbox); + pdf_dict_put_rect(ctx, form, PDF_NAME(BBox), bbox); *form_ref = pdf_add_object(ctx, doc, form); } fz_always(ctx) @@ -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, 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, 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, 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, fz_rect scissor) { pdf_device *pdev = (pdf_device*)dev; gstate *gs; @@ -731,7 +731,7 @@ 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, fz_matrix ctm, const fz_rect *scissor) +pdf_dev_clip_text(fz_context *ctx, fz_device *dev, const fz_text *text, fz_matrix ctm, fz_rect scissor) { pdf_device *pdev = (pdf_device*)dev; fz_text_span *span; @@ -745,7 +745,7 @@ pdf_dev_clip_text(fz_context *ctx, fz_device *dev, const fz_text *text, fz_matri } static void -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_dev_clip_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *stroke, fz_matrix ctm, fz_rect scissor) { pdf_device *pdev = (pdf_device*)dev; fz_text_span *span; @@ -871,7 +871,7 @@ pdf_dev_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, fz_mat } static void -pdf_dev_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, fz_matrix ctm, const fz_rect *scissor) +pdf_dev_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, fz_matrix ctm, fz_rect scissor) { pdf_device *pdev = (pdf_device*)dev; @@ -891,7 +891,7 @@ pdf_dev_pop_clip(fz_context *ctx, fz_device *dev) } static void -pdf_dev_begin_mask(fz_context *ctx, fz_device *dev, const fz_rect *bbox, int luminosity, fz_colorspace *colorspace, const float *color, const fz_color_params *color_params) +pdf_dev_begin_mask(fz_context *ctx, fz_device *dev, fz_rect bbox, int luminosity, fz_colorspace *colorspace, const float *color, const fz_color_params *color_params) { pdf_device *pdev = (pdf_device*)dev; pdf_document *doc = pdev->doc; @@ -975,7 +975,7 @@ pdf_dev_end_mask(fz_context *ctx, fz_device *dev) } static void -pdf_dev_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *bbox, fz_colorspace *cs, int isolated, int knockout, int blendmode, float alpha) +pdf_dev_begin_group(fz_context *ctx, fz_device *dev, fz_rect bbox, fz_colorspace *cs, int isolated, int knockout, int blendmode, float alpha) { pdf_device *pdev = (pdf_device*)dev; pdf_document *doc = pdev->doc; @@ -1029,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, fz_matrix ctm, int id) +pdf_dev_begin_tile(fz_context *ctx, fz_device *dev, fz_rect area, fz_rect view, float xstep, float ystep, fz_matrix ctm, int id) { pdf_device *pdev = (pdf_device*)dev; @@ -1078,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, 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, fz_rect mediabox, pdf_obj *resources, fz_buffer *buf) { pdf_device *dev = fz_new_derived_device(ctx, pdf_device); @@ -1145,10 +1145,9 @@ fz_device *pdf_new_pdf_device(fz_context *ctx, pdf_document *doc, fz_matrix topc return (fz_device*)dev; } -fz_device *pdf_page_write(fz_context *ctx, pdf_document *doc, - const fz_rect *mediabox, pdf_obj **presources, fz_buffer **pcontents) +fz_device *pdf_page_write(fz_context *ctx, pdf_document *doc, fz_rect mediabox, pdf_obj **presources, fz_buffer **pcontents) { - fz_matrix pagectm = { 1, 0, 0, -1, -mediabox->x0, mediabox->y1 }; + 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); diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c index b08657a6..0bd4ec21 100644 --- a/source/pdf/pdf-op-run.c +++ b/source/pdf/pdf-op-run.c @@ -139,7 +139,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); + 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); } fz_always(ctx) @@ -177,7 +177,7 @@ end_softmask(fz_context *ctx, pdf_run_processor *pr, softmask_save *save) } static pdf_gstate * -pdf_begin_group(fz_context *ctx, pdf_run_processor *pr, const fz_rect *bbox, softmask_save *softmask) +pdf_begin_group(fz_context *ctx, pdf_run_processor *pr, fz_rect bbox, softmask_save *softmask) { pdf_gstate *gstate = begin_softmask(ctx, pr, softmask); @@ -210,7 +210,7 @@ pdf_show_shade(fz_context *ctx, pdf_run_processor *pr, fz_shade *shd) bbox = fz_bound_shade(ctx, shd, gstate->ctm); - gstate = pdf_begin_group(ctx, pr, &bbox, &softmask); + gstate = pdf_begin_group(ctx, pr, bbox, &softmask); /* FIXME: The gstate->ctm in the next line may be wrong; maybe * it should be the parent gstates ctm? */ @@ -341,7 +341,7 @@ pdf_grestore(fz_context *ctx, pdf_run_processor *pr) } static void -pdf_show_pattern(fz_context *ctx, pdf_run_processor *pr, pdf_pattern *pat, pdf_gstate *pat_gstate, const fz_rect *area, int what) +pdf_show_pattern(fz_context *ctx, pdf_run_processor *pr, pdf_pattern *pat, pdf_gstate *pat_gstate, fz_rect area, int what) { pdf_gstate *gstate; int gparent_save; @@ -403,7 +403,7 @@ pdf_show_pattern(fz_context *ctx, pdf_run_processor *pr, pdf_pattern *pat, pdf_g /* patterns are painted using the parent_ctm. area = bbox of * shape to be filled in device space. Map it back to pattern * space. */ - local_area = fz_transform_rect(*area, invptm); + local_area = fz_transform_rect(area, invptm); fx0 = (local_area.x0 - pat->bbox.x0) / pat->xstep; fy0 = (local_area.y0 - pat->bbox.y0) / pat->ystep; @@ -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; @@ -552,10 +552,10 @@ pdf_show_image(fz_context *ctx, pdf_run_processor *pr, fz_image *image) if (image->mask && gstate->blendmode) { /* apply blend group even though we skip the soft mask */ - fz_begin_group(ctx, pr->dev, &bbox, NULL, 0, 0, gstate->blendmode, 1); + 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) @@ -586,10 +586,10 @@ pdf_show_image(fz_context *ctx, pdf_run_processor *pr, fz_image *image) { softmask_save softmask = { NULL }; - gstate = pdf_begin_group(ctx, pr, &bbox, &softmask); + 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) @@ -633,7 +633,7 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i dostroke = dofill = 0; if (dofill || dostroke) - gstate = pdf_begin_group(ctx, pr, &bbox, &softmask); + gstate = pdf_begin_group(ctx, pr, bbox, &softmask); if (dofill && dostroke) { @@ -649,7 +649,7 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i else { knockout_group = 1; - fz_begin_group(ctx, pr->dev, &bbox, NULL, 0, 1, FZ_BLEND_NORMAL, 1); + fz_begin_group(ctx, pr->dev, bbox, NULL, 0, 1, FZ_BLEND_NORMAL, 1); } } @@ -666,15 +666,15 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i case PDF_MAT_PATTERN: if (gstate->fill.pattern) { - 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_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); } break; 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_pop_clip(ctx, pr->dev); @@ -696,15 +696,15 @@ pdf_show_path(fz_context *ctx, pdf_run_processor *pr, int doclose, int dofill, i case PDF_MAT_PATTERN: if (gstate->stroke.pattern) { - 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_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); } break; case PDF_MAT_SHADE: if (gstate->stroke.shade) { - 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); 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); } @@ -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; } } @@ -783,7 +783,7 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) break; if (dofill || dostroke) - gstate = pdf_begin_group(ctx, pr, &tb, &softmask); + gstate = pdf_begin_group(ctx, pr, tb, &softmask); if (dofill && dostroke) { @@ -799,7 +799,7 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) else { knockout_group = 1; - fz_begin_group(ctx, pr->dev, &tb, NULL, 0, 1, FZ_BLEND_NORMAL, 1); + fz_begin_group(ctx, pr->dev, tb, NULL, 0, 1, FZ_BLEND_NORMAL, 1); } } @@ -819,15 +819,15 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) case PDF_MAT_PATTERN: if (gstate->fill.pattern) { - 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_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); } break; 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_pop_clip(ctx, pr->dev); @@ -849,15 +849,15 @@ pdf_flush_text(fz_context *ctx, pdf_run_processor *pr) case PDF_MAT_PATTERN: if (gstate->stroke.pattern) { - 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_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); } break; case PDF_MAT_SHADE: if (gstate->stroke.shade) { - 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); 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); } @@ -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) @@ -1253,7 +1253,7 @@ pdf_run_xobject(fz_context *ctx, pdf_run_processor *proc, pdf_obj *xobj, pdf_obj cleanup_state = 2; if (isolated) cs = pdf_xobject_colorspace(ctx, xobj); - fz_begin_group(ctx, pr->dev, &bbox, + fz_begin_group(ctx, pr->dev, bbox, cs, (is_smask ? 1 : isolated), pdf_xobject_knockout(ctx, xobj), diff --git a/source/pdf/pdf-run.c b/source/pdf/pdf-run.c index ae936253..5e4badf3 100644 --- a/source/pdf/pdf-run.c +++ b/source/pdf/pdf-run.c @@ -78,7 +78,7 @@ pdf_run_page_contents_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *p else colorspace = fz_keep_colorspace(ctx, fz_default_output_intent(ctx, default_cs)); - fz_begin_group(ctx, dev, &mediabox, colorspace, 1, 0, 0, 1); + fz_begin_group(ctx, dev, mediabox, colorspace, 1, 0, 0, 1); fz_drop_colorspace(ctx, colorspace); colorspace = NULL; } diff --git a/source/pdf/pdf-write.c b/source/pdf/pdf-write.c index 63863104..f1f49299 100644 --- a/source/pdf/pdf-write.c +++ b/source/pdf/pdf-write.c @@ -3286,11 +3286,11 @@ struct pdf_writer_s }; static fz_device * -pdf_writer_begin_page(fz_context *ctx, fz_document_writer *wri_, const fz_rect *mediabox) +pdf_writer_begin_page(fz_context *ctx, fz_document_writer *wri_, fz_rect mediabox) { pdf_writer *wri = (pdf_writer*)wri_; - wri->mediabox = *mediabox; - return pdf_page_write(ctx, wri->pdf, &wri->mediabox, &wri->resources, &wri->contents); + wri->mediabox = mediabox; + return pdf_page_write(ctx, wri->pdf, wri->mediabox, &wri->resources, &wri->contents); } static void -- cgit v1.2.3