From 63713f22ae830142dfe0d3896948ec53c4705ace Mon Sep 17 00:00:00 2001 From: Michael Vrhel Date: Fri, 23 Jun 2017 12:23:36 -0700 Subject: Add colorspace handling to transparency groups Also force softmasks to be isolated groups. --- source/fitz/bbox-device.c | 2 +- source/fitz/colorspace.c | 2 +- source/fitz/device.c | 4 ++-- source/fitz/draw-device.c | 12 +++++++++++- source/fitz/list-device.c | 46 ++++++++++++++++++++++++++++++---------------- source/fitz/svg-device.c | 2 +- source/fitz/test-device.c | 4 ++-- source/fitz/trace-device.c | 2 +- 8 files changed, 49 insertions(+), 25 deletions(-) (limited to 'source/fitz') diff --git a/source/fitz/bbox-device.c b/source/fitz/bbox-device.c index a288ec45..37778741 100644 --- a/source/fitz/bbox-device.c +++ b/source/fitz/bbox-device.c @@ -151,7 +151,7 @@ fz_bbox_end_mask(fz_context *ctx, fz_device *dev) } static void -fz_bbox_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *rect, int isolated, int knockout, int blendmode, float alpha) +fz_bbox_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *rect, fz_colorspace *cs, int isolated, int knockout, int blendmode, float alpha) { fz_bbox_add_rect(ctx, dev, rect, 1); } diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c index 229cd4ca..0a6d2b91 100644 --- a/source/fitz/colorspace.c +++ b/source/fitz/colorspace.c @@ -324,7 +324,7 @@ fz_new_icc_link(fz_context *ctx, fz_iccprofile *src, fz_iccprofile *prf, fz_iccp link->num_in = src->num_devcomp; link->num_out = dst->num_devcomp; - if (memcmp(src->md5, dst->md5, 16) == 0 && rend->ri == FZ_RI_RELATIVE_COLORIMETRIC && prf == NULL) + if (memcmp(src->md5, dst->md5, 16) == 0 && prf == NULL) { link->is_identity = 1; return link; diff --git a/source/fitz/device.c b/source/fitz/device.c index fcf135d0..0f658d31 100644 --- a/source/fitz/device.c +++ b/source/fitz/device.c @@ -416,7 +416,7 @@ fz_end_mask(fz_context *ctx, fz_device *dev) } void -fz_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *area, int isolated, int knockout, int blendmode, float alpha) +fz_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *area, fz_colorspace *cs, int isolated, int knockout, int blendmode, float alpha) { if (dev->error_depth) { @@ -429,7 +429,7 @@ fz_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *area, int isolate if (dev->hints & FZ_MAINTAIN_CONTAINER_STACK) push_clip_stack(ctx, dev, area, fz_device_container_stack_is_group); if (dev->begin_group) - dev->begin_group(ctx, dev, area, isolated, knockout, blendmode, alpha); + dev->begin_group(ctx, dev, area, cs, isolated, knockout, blendmode, alpha); } fz_catch(ctx) { diff --git a/source/fitz/draw-device.c b/source/fitz/draw-device.c index 54ed3f05..66b198fc 100644 --- a/source/fitz/draw-device.c +++ b/source/fitz/draw-device.c @@ -1854,7 +1854,7 @@ fz_draw_end_mask(fz_context *ctx, fz_device *devp) } static void -fz_draw_begin_group(fz_context *ctx, fz_device *devp, const fz_rect *rect, int isolated, int knockout, int blendmode, float alpha) +fz_draw_begin_group(fz_context *ctx, fz_device *devp, const fz_rect *rect, fz_colorspace *cs, int isolated, int knockout, int blendmode, float alpha) { fz_draw_device *dev = (fz_draw_device*)devp; fz_irect bbox; @@ -1863,6 +1863,9 @@ fz_draw_begin_group(fz_context *ctx, fz_device *devp, const fz_rect *rect, int i fz_colorspace *model = state->dest->colorspace; fz_rect trect = *rect; + if (cs != NULL) + model = fz_default_colorspace(ctx, dev->default_cs, cs); + if (state->blendmode & FZ_BLEND_KNOCKOUT) fz_knockout_begin(ctx, dev); @@ -1952,6 +1955,13 @@ fz_draw_end_group(fz_context *ctx, fz_device *devp) if (state[1].blendmode & FZ_BLEND_KNOCKOUT) printf(" (knockout)"); #endif + if (state[0].dest->colorspace != state[1].dest->colorspace) + { + fz_pixmap *converted = fz_convert_pixmap(ctx, state[1].dest, state[0].dest->colorspace, NULL, dev->default_cs, fz_default_color_params(ctx), 1); + fz_drop_pixmap(ctx, state[1].dest); + state[1].dest = converted; + } + if ((blendmode == 0) && (state[0].shape == state[1].shape)) fz_paint_pixmap(state[0].dest, state[1].dest, alpha * 255); else diff --git a/source/fitz/list-device.c b/source/fitz/list-device.c index 4d2f0c00..03f163a5 100644 --- a/source/fitz/list-device.c +++ b/source/fitz/list-device.c @@ -1098,29 +1098,40 @@ fz_list_end_mask(fz_context *ctx, fz_device *dev) } static void -fz_list_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *rect, int isolated, int knockout, int blendmode, float alpha) +fz_list_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *rect, fz_colorspace *colorspace, int isolated, int knockout, int blendmode, float alpha) { int flags; + colorspace = fz_keep_colorspace(ctx, colorspace); + flags = (blendmode<<2); if (isolated) flags |= ISOLATED; if (knockout) flags |= KNOCKOUT; - fz_append_display_node( - ctx, - dev, - FZ_CMD_BEGIN_GROUP, - flags, - rect, - NULL, /* path */ - NULL, /* color */ - NULL, /* colorspace */ - &alpha, /* alpha */ - NULL, /* ctm */ - NULL, /* stroke */ - NULL, /* private_data */ - 0); /* private_data_len */ + + fz_try(ctx) + { + fz_append_display_node( + ctx, + dev, + FZ_CMD_BEGIN_GROUP, + flags, + rect, + NULL, /* path */ + NULL, /* color */ + NULL, /* colorspace */ + &alpha, /* alpha */ + NULL, /* ctm */ + NULL, /* stroke */ + &colorspace, /* private_data */ + sizeof(colorspace)); /* private_data_len */ + } + fz_catch(ctx) + { + fz_drop_colorspace(ctx, colorspace); + fz_rethrow(ctx); + } } static void @@ -1394,6 +1405,9 @@ fz_drop_display_list_imp(fz_context *ctx, fz_storable *list_) case FZ_CMD_CLIP_IMAGE_MASK: fz_drop_image(ctx, *(fz_image **)node); break; + case FZ_CMD_BEGIN_GROUP: + fz_drop_colorspace(ctx, *(fz_colorspace **)node); + break; case FZ_CMD_DEFAULT_COLORSPACES: fz_drop_default_colorspaces(ctx, *(fz_default_colorspaces **)node); break; @@ -1732,7 +1746,7 @@ visible: fz_end_mask(ctx, dev); break; case FZ_CMD_BEGIN_GROUP: - fz_begin_group(ctx, dev, &trans_rect, (n.flags & ISOLATED) != 0, (n.flags & KNOCKOUT) != 0, (n.flags>>2), alpha); + fz_begin_group(ctx, dev, &trans_rect, *(fz_colorspace **)node, (n.flags & ISOLATED) != 0, (n.flags & KNOCKOUT) != 0, (n.flags>>2), alpha); break; case FZ_CMD_END_GROUP: fz_end_group(ctx, dev); diff --git a/source/fitz/svg-device.c b/source/fitz/svg-device.c index 1bd6987f..b327824f 100644 --- a/source/fitz/svg-device.c +++ b/source/fitz/svg-device.c @@ -1094,7 +1094,7 @@ svg_dev_end_mask(fz_context *ctx, fz_device *dev) } static void -svg_dev_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *bbox, int isolated, int knockout, int blendmode, float alpha) +svg_dev_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *bbox, fz_colorspace *cs, int isolated, int knockout, int blendmode, float alpha) { svg_device *sdev = (svg_device*)dev; fz_output *out = sdev->out; diff --git a/source/fitz/test-device.c b/source/fitz/test-device.c index aa6631a8..94572a55 100644 --- a/source/fitz/test-device.c +++ b/source/fitz/test-device.c @@ -439,11 +439,11 @@ fz_test_end_mask(fz_context *ctx, fz_device *dev_) } static void -fz_test_begin_group(fz_context *ctx, fz_device *dev_, const fz_rect *rect, int isolated, int knockout, int blendmode, float alpha) +fz_test_begin_group(fz_context *ctx, fz_device *dev_, const fz_rect *rect, fz_colorspace *cs, int isolated, int knockout, int blendmode, float alpha) { fz_test_device *dev = (fz_test_device*)dev_; - fz_begin_group(ctx, dev->passthrough, rect, isolated, knockout, blendmode, alpha); + fz_begin_group(ctx, dev->passthrough, rect, cs, isolated, knockout, blendmode, alpha); } static void diff --git a/source/fitz/trace-device.c b/source/fitz/trace-device.c index db08aa52..13ce7256 100644 --- a/source/fitz/trace-device.c +++ b/source/fitz/trace-device.c @@ -313,7 +313,7 @@ fz_trace_end_mask(fz_context *ctx, fz_device *dev) } static void -fz_trace_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *bbox, int isolated, int knockout, int blendmode, float alpha) +fz_trace_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *bbox, fz_colorspace *cs, int isolated, int knockout, int blendmode, float alpha) { fz_output *out = ((fz_trace_device*)dev)->out; fz_write_printf(ctx, out, "\n", -- cgit v1.2.3