diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2015-02-17 14:41:50 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2015-02-17 18:06:11 +0100 |
commit | 31186b61d979ba02c04ce68dcb66f7a5f1229c93 (patch) | |
tree | 84aa2debf18e6e4bab6c803e4b759b8851ce0ff4 /source/fitz/bbox-device.c | |
parent | 72679561cddc6b2586e596f62492b79dcf9f118d (diff) | |
download | mupdf-31186b61d979ba02c04ce68dcb66f7a5f1229c93.tar.xz |
Use embedded superclass struct instead of user pointer in devices.
Diffstat (limited to 'source/fitz/bbox-device.c')
-rw-r--r-- | source/fitz/bbox-device.c | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/source/fitz/bbox-device.c b/source/fitz/bbox-device.c index b11a78a7..2c639499 100644 --- a/source/fitz/bbox-device.c +++ b/source/fitz/bbox-device.c @@ -2,32 +2,34 @@ #define STACK_SIZE 96 -typedef struct fz_bbox_data_s +typedef struct fz_bbox_device_s { + fz_device super; + fz_rect *result; int top; fz_rect stack[STACK_SIZE]; /* mask content and tiles are ignored */ int ignore; -} fz_bbox_data; +} fz_bbox_device; static void fz_bbox_add_rect(fz_context *ctx, fz_device *dev, const fz_rect *rect, int clip) { - fz_bbox_data *data = dev->user; + fz_bbox_device *bdev = (fz_bbox_device*)dev; fz_rect r = *rect; - if (0 < data->top && data->top <= STACK_SIZE) + if (0 < bdev->top && bdev->top <= STACK_SIZE) { - fz_intersect_rect(&r, &data->stack[data->top-1]); + fz_intersect_rect(&r, &bdev->stack[bdev->top-1]); } - if (!clip && data->top <= STACK_SIZE && !data->ignore) + if (!clip && bdev->top <= STACK_SIZE && !bdev->ignore) { - fz_union_rect(data->result, &r); + fz_union_rect(bdev->result, &r); } - if (clip && ++data->top <= STACK_SIZE) + if (clip && ++bdev->top <= STACK_SIZE) { - data->stack[data->top-1] = r; + bdev->stack[bdev->top-1] = r; } } @@ -126,9 +128,9 @@ fz_bbox_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const static void fz_bbox_pop_clip(fz_context *ctx, fz_device *dev) { - fz_bbox_data *data = dev->user; - if (data->top > 0) - data->top--; + fz_bbox_device *bdev = (fz_bbox_device*)dev; + if (bdev->top > 0) + bdev->top--; else fz_warn(ctx, "unexpected pop clip"); } @@ -136,17 +138,17 @@ fz_bbox_pop_clip(fz_context *ctx, fz_device *dev) static void fz_bbox_begin_mask(fz_context *ctx, fz_device *dev, const fz_rect *rect, int luminosity, fz_colorspace *colorspace, float *color) { - fz_bbox_data *data = dev->user; + fz_bbox_device *bdev = (fz_bbox_device*)dev; fz_bbox_add_rect(ctx, dev, rect, 1); - data->ignore++; + bdev->ignore++; } static void fz_bbox_end_mask(fz_context *ctx, fz_device *dev) { - fz_bbox_data *data = dev->user; - assert(data->ignore > 0); - data->ignore--; + fz_bbox_device *bdev = (fz_bbox_device*)dev; + assert(bdev->ignore > 0); + bdev->ignore--; } static void @@ -164,68 +166,66 @@ fz_bbox_end_group(fz_context *ctx, fz_device *dev) static int fz_bbox_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) { - fz_bbox_data *data = dev->user; + fz_bbox_device *bdev = (fz_bbox_device*)dev; fz_rect r = *area; fz_bbox_add_rect(ctx, dev, fz_transform_rect(&r, ctm), 0); - data->ignore++; + bdev->ignore++; return 0; } static void fz_bbox_end_tile(fz_context *ctx, fz_device *dev) { - fz_bbox_data *data = dev->user; - assert(data->ignore > 0); - data->ignore--; + fz_bbox_device *bdev = (fz_bbox_device*)dev; + assert(bdev->ignore > 0); + bdev->ignore--; } static void -fz_bbox_drop_user(fz_context *ctx, fz_device *dev) +fz_bbox_drop_imp(fz_context *ctx, fz_device *dev) { - fz_bbox_data *data = dev->user; - if (data->top > 0) - fz_warn(ctx, "items left on stack in bbox device: %d", data->top); - fz_free(ctx, dev->user); + fz_bbox_device *bdev = (fz_bbox_device*)dev; + if (bdev->top > 0) + fz_warn(ctx, "items left on stack in bbox device: %d", bdev->top); } fz_device * fz_new_bbox_device(fz_context *ctx, fz_rect *result) { - fz_device *dev; + fz_bbox_device *dev = fz_new_device(ctx, sizeof *dev); + + dev->super.drop_imp = fz_bbox_drop_imp; - fz_bbox_data *user = fz_malloc_struct(ctx, fz_bbox_data); - user->result = result; - user->top = 0; - user->ignore = 0; - dev = fz_new_device(ctx, user); - dev->drop_user = fz_bbox_drop_user; + dev->super.fill_path = fz_bbox_fill_path; + dev->super.stroke_path = fz_bbox_stroke_path; + dev->super.clip_path = fz_bbox_clip_path; + dev->super.clip_stroke_path = fz_bbox_clip_stroke_path; - dev->fill_path = fz_bbox_fill_path; - dev->stroke_path = fz_bbox_stroke_path; - dev->clip_path = fz_bbox_clip_path; - dev->clip_stroke_path = fz_bbox_clip_stroke_path; + dev->super.fill_text = fz_bbox_fill_text; + dev->super.stroke_text = fz_bbox_stroke_text; + dev->super.clip_text = fz_bbox_clip_text; + dev->super.clip_stroke_text = fz_bbox_clip_stroke_text; - dev->fill_text = fz_bbox_fill_text; - dev->stroke_text = fz_bbox_stroke_text; - dev->clip_text = fz_bbox_clip_text; - dev->clip_stroke_text = fz_bbox_clip_stroke_text; + dev->super.fill_shade = fz_bbox_fill_shade; + dev->super.fill_image = fz_bbox_fill_image; + dev->super.fill_image_mask = fz_bbox_fill_image_mask; + dev->super.clip_image_mask = fz_bbox_clip_image_mask; - dev->fill_shade = fz_bbox_fill_shade; - dev->fill_image = fz_bbox_fill_image; - dev->fill_image_mask = fz_bbox_fill_image_mask; - dev->clip_image_mask = fz_bbox_clip_image_mask; + dev->super.pop_clip = fz_bbox_pop_clip; - dev->pop_clip = fz_bbox_pop_clip; + dev->super.begin_mask = fz_bbox_begin_mask; + dev->super.end_mask = fz_bbox_end_mask; + dev->super.begin_group = fz_bbox_begin_group; + dev->super.end_group = fz_bbox_end_group; - dev->begin_mask = fz_bbox_begin_mask; - dev->end_mask = fz_bbox_end_mask; - dev->begin_group = fz_bbox_begin_group; - dev->end_group = fz_bbox_end_group; + dev->super.begin_tile = fz_bbox_begin_tile; + dev->super.end_tile = fz_bbox_end_tile; - dev->begin_tile = fz_bbox_begin_tile; - dev->end_tile = fz_bbox_end_tile; + dev->result = result; + dev->top = 0; + dev->ignore = 0; *result = fz_empty_rect; - return dev; + return (fz_device*)dev; } |