diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2012-03-13 13:36:39 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2012-03-13 14:03:09 +0100 |
commit | 7eca6b0d05443e85ecd7bb107dccf410696364aa (patch) | |
tree | e4f5c9a362e7a4c7b51b2d07087f422043de9f2f /draw | |
parent | 48652e529ed1c0ae23cfd45f14d9655ad2849c89 (diff) | |
download | mupdf-7eca6b0d05443e85ecd7bb107dccf410696364aa.tar.xz |
Add ctx argument and rename fz_bound_pixmap to fz_pixmap_bbox.
Diffstat (limited to 'draw')
-rw-r--r-- | draw/draw_blend.c | 4 | ||||
-rw-r--r-- | draw/draw_device.c | 16 | ||||
-rw-r--r-- | draw/draw_paint.c | 14 |
3 files changed, 17 insertions, 17 deletions
diff --git a/draw/draw_blend.c b/draw/draw_blend.c index 904de768..7c74df79 100644 --- a/draw/draw_blend.c +++ b/draw/draw_blend.c @@ -589,8 +589,8 @@ fz_blend_pixmap(fz_pixmap *dst, fz_pixmap *src, int alpha, int blendmode, int is } } - bbox = fz_bound_pixmap(dst); - bbox = fz_intersect_bbox(bbox, fz_bound_pixmap(src)); + bbox = fz_pixmap_bbox_no_ctx(dst); + bbox = fz_intersect_bbox(bbox, fz_pixmap_bbox_no_ctx(src)); x = bbox.x0; y = bbox.y0; diff --git a/draw/draw_device.c b/draw/draw_device.c index ec4e2df5..76f934bd 100644 --- a/draw/draw_device.c +++ b/draw/draw_device.c @@ -121,7 +121,7 @@ fz_knockout_begin(fz_draw_device *dev) state = push_stack(dev); - bbox = fz_bound_pixmap(state->dest); + bbox = fz_pixmap_bbox(dev->ctx, state->dest); bbox = fz_intersect_bbox(bbox, state->scissor); dest = fz_new_pixmap_with_bbox(dev->ctx, state->dest->colorspace, bbox); @@ -427,7 +427,7 @@ draw_glyph(unsigned char *colorbv, fz_pixmap *dst, fz_pixmap *msk, fz_bbox bbox; int x, y, w, h; - bbox = fz_bound_pixmap(msk); + bbox = fz_pixmap_bbox_no_ctx(msk); bbox.x0 += xorig; bbox.y0 += yorig; bbox.x1 += xorig; @@ -890,7 +890,7 @@ fz_draw_fill_image(fz_device *devp, fz_image *image, fz_matrix ctm, float alpha) fz_context *ctx = dev->ctx; fz_draw_state *state = &dev->stack[dev->top]; fz_colorspace *model = state->dest->colorspace; - fz_bbox clip = fz_bound_pixmap(state->dest); + fz_bbox clip = fz_pixmap_bbox(ctx, state->dest); clip = fz_intersect_bbox(clip, state->scissor); @@ -926,7 +926,7 @@ fz_draw_fill_image(fz_device *devp, fz_image *image, fz_matrix ctm, float alpha) if (pixmap->colorspace != model && !after) { - converted = fz_new_pixmap_with_bbox(ctx, model, fz_bound_pixmap(pixmap)); + converted = fz_new_pixmap_with_bbox(ctx, model, fz_pixmap_bbox(ctx, pixmap)); fz_convert_pixmap(ctx, converted, pixmap); pixmap = converted; } @@ -956,7 +956,7 @@ fz_draw_fill_image(fz_device *devp, fz_image *image, fz_matrix ctm, float alpha) } else { - converted = fz_new_pixmap_with_bbox(ctx, model, fz_bound_pixmap(pixmap)); + converted = fz_new_pixmap_with_bbox(ctx, model, fz_pixmap_bbox(ctx, pixmap)); fz_convert_pixmap(ctx, converted, pixmap); pixmap = converted; } @@ -994,7 +994,7 @@ fz_draw_fill_image_mask(fz_device *devp, fz_image *image, fz_matrix ctm, fz_context *ctx = dev->ctx; fz_draw_state *state = &dev->stack[dev->top]; fz_colorspace *model = state->dest->colorspace; - fz_bbox clip = fz_bound_pixmap(state->dest); + fz_bbox clip = fz_pixmap_bbox(ctx, state->dest); clip = fz_intersect_bbox(clip, state->scissor); @@ -1065,7 +1065,7 @@ fz_draw_clip_image_mask(fz_device *devp, fz_image *image, fz_rect *rect, fz_matr int dx, dy; fz_draw_state *state = push_stack(dev); fz_colorspace *model = state->dest->colorspace; - fz_bbox clip = fz_bound_pixmap(state->dest); + fz_bbox clip = fz_pixmap_bbox(ctx, state->dest); clip = fz_intersect_bbox(clip, state->scissor); @@ -1284,7 +1284,7 @@ fz_draw_end_mask(fz_device *devp) state[1].mask = NULL; /* create new dest scratch buffer */ - bbox = fz_bound_pixmap(temp); + bbox = fz_pixmap_bbox(ctx, temp); dest = fz_new_pixmap_with_bbox(dev->ctx, state->dest->colorspace, bbox); fz_clear_pixmap(dev->ctx, dest); diff --git a/draw/draw_paint.c b/draw/draw_paint.c index 6a73783b..2a5f9607 100644 --- a/draw/draw_paint.c +++ b/draw/draw_paint.c @@ -382,8 +382,8 @@ fz_paint_pixmap_with_rect(fz_pixmap *dst, fz_pixmap *src, int alpha, fz_bbox bbo assert(dst->n == src->n); - bbox = fz_intersect_bbox(bbox, fz_bound_pixmap(dst)); - bbox = fz_intersect_bbox(bbox, fz_bound_pixmap(src)); + bbox = fz_intersect_bbox(bbox, fz_pixmap_bbox_no_ctx(dst)); + bbox = fz_intersect_bbox(bbox, fz_pixmap_bbox_no_ctx(src)); x = bbox.x0; y = bbox.y0; @@ -413,8 +413,8 @@ fz_paint_pixmap(fz_pixmap *dst, fz_pixmap *src, int alpha) assert(dst->n == src->n); - bbox = fz_bound_pixmap(dst); - bbox = fz_intersect_bbox(bbox, fz_bound_pixmap(src)); + bbox = fz_pixmap_bbox_no_ctx(dst); + bbox = fz_intersect_bbox(bbox, fz_pixmap_bbox_no_ctx(src)); x = bbox.x0; y = bbox.y0; @@ -445,9 +445,9 @@ fz_paint_pixmap_with_mask(fz_pixmap *dst, fz_pixmap *src, fz_pixmap *msk) assert(dst->n == src->n); assert(msk->n == 1); - bbox = fz_bound_pixmap(dst); - bbox = fz_intersect_bbox(bbox, fz_bound_pixmap(src)); - bbox = fz_intersect_bbox(bbox, fz_bound_pixmap(msk)); + bbox = fz_pixmap_bbox_no_ctx(dst); + bbox = fz_intersect_bbox(bbox, fz_pixmap_bbox_no_ctx(src)); + bbox = fz_intersect_bbox(bbox, fz_pixmap_bbox_no_ctx(msk)); x = bbox.x0; y = bbox.y0; |