diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2016-02-22 14:20:37 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2016-02-22 14:31:17 +0100 |
commit | 2af96d78c56c9cc81176c732563a5a4338012a0b (patch) | |
tree | 14870652195ea97de5a6a6630a0b478ecce8fba9 /source/fitz | |
parent | ad8a5680e6d3fd1ad77ae2c1a3d38ebe2042f2cb (diff) | |
download | mupdf-2af96d78c56c9cc81176c732563a5a4338012a0b.tar.xz |
Drop const from fz_image.
Image objects are immutable and opaque once constructed.
Therefore there is no need for the const keyword.
Diffstat (limited to 'source/fitz')
-rw-r--r-- | source/fitz/bbox-device.c | 6 | ||||
-rw-r--r-- | source/fitz/device.c | 6 | ||||
-rw-r--r-- | source/fitz/draw-device.c | 6 | ||||
-rw-r--r-- | source/fitz/image.c | 16 | ||||
-rw-r--r-- | source/fitz/list-device.c | 6 | ||||
-rw-r--r-- | source/fitz/pixmap.c | 2 | ||||
-rw-r--r-- | source/fitz/stext-device.c | 4 | ||||
-rw-r--r-- | source/fitz/svg-device.c | 6 | ||||
-rw-r--r-- | source/fitz/test-device.c | 4 | ||||
-rw-r--r-- | source/fitz/trace-device.c | 6 |
10 files changed, 31 insertions, 31 deletions
diff --git a/source/fitz/bbox-device.c b/source/fitz/bbox-device.c index 960bf0eb..e7ef249c 100644 --- a/source/fitz/bbox-device.c +++ b/source/fitz/bbox-device.c @@ -73,14 +73,14 @@ fz_bbox_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_ma } static void -fz_bbox_fill_image(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, float alpha) +fz_bbox_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, float alpha) { fz_rect r = fz_unit_rect; fz_bbox_add_rect(ctx, dev, fz_transform_rect(&r, ctm), 0); } static void -fz_bbox_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, +fz_bbox_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha) { fz_rect r = fz_unit_rect; @@ -116,7 +116,7 @@ fz_bbox_clip_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, c } static void -fz_bbox_clip_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_rect *rect, const fz_matrix *ctm) +fz_bbox_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_rect *rect, const fz_matrix *ctm) { fz_rect r = fz_unit_rect; fz_bbox_add_rect(ctx, dev, fz_transform_rect(&r, ctm), 1); diff --git a/source/fitz/device.c b/source/fitz/device.c index ae5b9f24..1926cc16 100644 --- a/source/fitz/device.c +++ b/source/fitz/device.c @@ -270,7 +270,7 @@ fz_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_matrix } void -fz_fill_image(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, float alpha) +fz_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, float alpha) { if (dev->error_depth) return; @@ -279,7 +279,7 @@ fz_fill_image(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_m } void -fz_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, +fz_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha) { if (dev->error_depth) @@ -289,7 +289,7 @@ fz_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const } void -fz_clip_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_rect *rect, const fz_matrix *ctm) +fz_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_rect *rect, const fz_matrix *ctm) { if (dev->error_depth) { diff --git a/source/fitz/draw-device.c b/source/fitz/draw-device.c index b623a53b..fead1b0a 100644 --- a/source/fitz/draw-device.c +++ b/source/fitz/draw-device.c @@ -1083,7 +1083,7 @@ fz_transform_pixmap(fz_context *ctx, fz_draw_device *dev, const fz_pixmap *image } static void -fz_draw_fill_image(fz_context *ctx, fz_device *devp, const fz_image *image, const fz_matrix *ctm, float alpha) +fz_draw_fill_image(fz_context *ctx, fz_device *devp, fz_image *image, const fz_matrix *ctm, float alpha) { fz_draw_device *dev = (fz_draw_device*)devp; fz_pixmap *converted = NULL; @@ -1189,7 +1189,7 @@ fz_draw_fill_image(fz_context *ctx, fz_device *devp, const fz_image *image, cons } static void -fz_draw_fill_image_mask(fz_context *ctx, fz_device *devp, const fz_image *image, const fz_matrix *ctm, +fz_draw_fill_image_mask(fz_context *ctx, fz_device *devp, fz_image *image, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha) { fz_draw_device *dev = (fz_draw_device*)devp; @@ -1261,7 +1261,7 @@ fz_draw_fill_image_mask(fz_context *ctx, fz_device *devp, const fz_image *image, } static void -fz_draw_clip_image_mask(fz_context *ctx, fz_device *devp, const fz_image *image, const fz_rect *rect, const fz_matrix *ctm) +fz_draw_clip_image_mask(fz_context *ctx, fz_device *devp, fz_image *image, const fz_rect *rect, const fz_matrix *ctm) { fz_draw_device *dev = (fz_draw_device*)devp; fz_irect bbox; diff --git a/source/fitz/image.c b/source/fitz/image.c index 297e6263..59e2ab56 100644 --- a/source/fitz/image.c +++ b/source/fitz/image.c @@ -3,13 +3,13 @@ #define SANE_DPI 72.0f fz_image * -fz_keep_image(fz_context *ctx, const fz_image *image) +fz_keep_image(fz_context *ctx, fz_image *image) { - return (fz_image *)fz_keep_storable(ctx, &image->storable); + return fz_keep_storable(ctx, &image->storable); } void -fz_drop_image(fz_context *ctx, const fz_image *image) +fz_drop_image(fz_context *ctx, fz_image *image) { fz_drop_storable(ctx, &image->storable); } @@ -18,7 +18,7 @@ typedef struct fz_image_key_s fz_image_key; struct fz_image_key_s { int refs; - const fz_image *image; + fz_image *image; int l2factor; }; @@ -93,7 +93,7 @@ fz_mask_color_key(fz_pixmap *pix, int n, const int *colorkey) } static void -fz_unblend_masked_tile(fz_context *ctx, fz_pixmap *tile, const fz_image *image) +fz_unblend_masked_tile(fz_context *ctx, fz_pixmap *tile, fz_image *image) { fz_pixmap *mask = fz_get_pixmap_from_image(ctx, image->mask, tile->w, tile->h); unsigned char *s = mask->samples, *end = s + mask->w * mask->h; @@ -121,7 +121,7 @@ fz_unblend_masked_tile(fz_context *ctx, fz_pixmap *tile, const fz_image *image) } fz_pixmap * -fz_decomp_image_from_stream(fz_context *ctx, fz_stream *stm, const fz_image *image, int indexed, int l2factor) +fz_decomp_image_from_stream(fz_context *ctx, fz_stream *stm, fz_image *image, int indexed, int l2factor) { fz_pixmap *tile = NULL; int stride, len, i; @@ -218,7 +218,7 @@ fz_drop_image_imp(fz_context *ctx, fz_storable *image_) } static fz_pixmap * -standard_image_get_pixmap(fz_context *ctx, const fz_image *image, int w, int h, int *l2factor) +standard_image_get_pixmap(fz_context *ctx, fz_image *image, int w, int h, int *l2factor) { int native_l2factor; fz_stream *stm; @@ -285,7 +285,7 @@ standard_image_get_pixmap(fz_context *ctx, const fz_image *image, int w, int h, } fz_pixmap * -fz_get_pixmap_from_image(fz_context *ctx, const fz_image *image, int w, int h) +fz_get_pixmap_from_image(fz_context *ctx, fz_image *image, int w, int h) { fz_pixmap *tile; int l2factor, l2factor_remaining; diff --git a/source/fitz/list-device.c b/source/fitz/list-device.c index e33f028c..099656d0 100644 --- a/source/fitz/list-device.c +++ b/source/fitz/list-device.c @@ -979,7 +979,7 @@ fz_list_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_ma } static void -fz_list_fill_image(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, float alpha) +fz_list_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, float alpha) { fz_image *image2 = fz_keep_image(ctx, image); fz_rect rect = fz_unit_rect; @@ -1010,7 +1010,7 @@ fz_list_fill_image(fz_context *ctx, fz_device *dev, const fz_image *image, const } static void -fz_list_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, +fz_list_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha) { fz_image *image2 = fz_keep_image(ctx, image); @@ -1042,7 +1042,7 @@ fz_list_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, } static void -fz_list_clip_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_rect *rect, const fz_matrix *ctm) +fz_list_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_rect *rect, const fz_matrix *ctm) { fz_image *image2 = fz_keep_image(ctx, image); fz_rect rect2 = fz_unit_rect; diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c index 8bdb5cb9..38c96f0f 100644 --- a/source/fitz/pixmap.c +++ b/source/fitz/pixmap.c @@ -1012,7 +1012,7 @@ png_from_pixmap(fz_context *ctx, fz_pixmap *pix, int drop) } fz_buffer * -fz_new_buffer_from_image_as_png(fz_context *ctx, const fz_image *image, int w, int h) +fz_new_buffer_from_image_as_png(fz_context *ctx, fz_image *image, int w, int h) { return png_from_pixmap(ctx, fz_get_pixmap_from_image(ctx, image, image->w, image->h), 1); } diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c index d4a0ab46..9652436a 100644 --- a/source/fitz/stext-device.c +++ b/source/fitz/stext-device.c @@ -893,7 +893,7 @@ fz_stext_ignore_text(fz_context *ctx, fz_device *dev, const fz_text *text, const } static void -fz_stext_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *img, const fz_matrix *ctm, +fz_stext_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *img, const fz_matrix *ctm, fz_colorspace *cspace, const float *color, float alpha) { fz_stext_device *tdev = (fz_stext_device*)dev; @@ -929,7 +929,7 @@ fz_stext_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *img, c } static void -fz_stext_fill_image(fz_context *ctx, fz_device *dev, const fz_image *img, const fz_matrix *ctm, float alpha) +fz_stext_fill_image(fz_context *ctx, fz_device *dev, fz_image *img, const fz_matrix *ctm, float alpha) { fz_stext_fill_image_mask(ctx, dev, img, ctm, NULL, NULL, alpha); } diff --git a/source/fitz/svg-device.c b/source/fitz/svg-device.c index 584911c9..f6e49a8a 100644 --- a/source/fitz/svg-device.c +++ b/source/fitz/svg-device.c @@ -714,7 +714,7 @@ send_data_base64(fz_context *ctx, fz_output *out, fz_buffer *buffer) } static void -svg_dev_fill_image(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, float alpha) +svg_dev_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, float alpha) { svg_device *sdev = (svg_device*)dev; fz_output *out = sdev->out; @@ -801,7 +801,7 @@ svg_dev_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_ma } static void -svg_dev_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, +svg_dev_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha) { svg_device *sdev = (svg_device*)dev; @@ -846,7 +846,7 @@ svg_dev_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, } static void -svg_dev_clip_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_rect *rect, const fz_matrix *ctm) +svg_dev_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_rect *rect, const fz_matrix *ctm) { svg_device *sdev = (svg_device*)dev; fz_output *out; diff --git a/source/fitz/test-device.c b/source/fitz/test-device.c index 946e636d..64c7804f 100644 --- a/source/fitz/test-device.c +++ b/source/fitz/test-device.c @@ -122,7 +122,7 @@ fz_test_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_ma } static void -fz_test_fill_image(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, float alpha) +fz_test_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, float alpha) { fz_test_device *t = (fz_test_device*)dev; @@ -241,7 +241,7 @@ fz_test_fill_image(fz_context *ctx, fz_device *dev, const fz_image *image, const } static void -fz_test_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, +fz_test_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha) { /* We assume that at least some of the image pixels are non-zero */ diff --git a/source/fitz/trace-device.c b/source/fitz/trace-device.c index 81ab9156..471c71ab 100644 --- a/source/fitz/trace-device.c +++ b/source/fitz/trace-device.c @@ -251,7 +251,7 @@ fz_trace_ignore_text(fz_context *ctx, fz_device *dev, const fz_text *text, const } static void -fz_trace_fill_image(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, float alpha) +fz_trace_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, float alpha) { fz_output *out = ((fz_trace_device*)dev)->out; fz_printf(ctx, out, "<fill_image alpha=\"%g\"", alpha); @@ -270,7 +270,7 @@ fz_trace_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_m } static void -fz_trace_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, +fz_trace_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha) { fz_output *out = ((fz_trace_device*)dev)->out; @@ -282,7 +282,7 @@ fz_trace_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, } static void -fz_trace_clip_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_rect *rect, const fz_matrix *ctm) +fz_trace_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_rect *rect, const fz_matrix *ctm) { fz_output *out = ((fz_trace_device*)dev)->out; fz_printf(ctx, out, "<clip_image_mask"); |