summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2016-02-22 14:20:37 +0100
committerTor Andersson <tor.andersson@artifex.com>2016-02-22 14:31:17 +0100
commit2af96d78c56c9cc81176c732563a5a4338012a0b (patch)
tree14870652195ea97de5a6a6630a0b478ecce8fba9 /include
parentad8a5680e6d3fd1ad77ae2c1a3d38ebe2042f2cb (diff)
downloadmupdf-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 'include')
-rw-r--r--include/mupdf/fitz/device.h12
-rw-r--r--include/mupdf/fitz/image.h10
-rw-r--r--include/mupdf/fitz/output-png.h2
3 files changed, 12 insertions, 12 deletions
diff --git a/include/mupdf/fitz/device.h b/include/mupdf/fitz/device.h
index b2c714bb..e062f7f0 100644
--- a/include/mupdf/fitz/device.h
+++ b/include/mupdf/fitz/device.h
@@ -118,9 +118,9 @@ struct fz_device_s
void (*ignore_text)(fz_context *, fz_device *, const fz_text *, const fz_matrix *);
void (*fill_shade)(fz_context *, fz_device *, fz_shade *shd, const fz_matrix *ctm, float alpha);
- void (*fill_image)(fz_context *, fz_device *, const fz_image *img, const fz_matrix *ctm, float alpha);
- void (*fill_image_mask)(fz_context *, fz_device *, const fz_image *img, const fz_matrix *ctm, fz_colorspace *, const float *color, float alpha);
- void (*clip_image_mask)(fz_context *, fz_device *, const fz_image *img, const fz_rect *rect, const fz_matrix *ctm);
+ void (*fill_image)(fz_context *, fz_device *, fz_image *img, const fz_matrix *ctm, float alpha);
+ void (*fill_image_mask)(fz_context *, fz_device *, fz_image *img, const fz_matrix *ctm, fz_colorspace *, const float *color, float alpha);
+ void (*clip_image_mask)(fz_context *, fz_device *, fz_image *img, const fz_rect *rect, const fz_matrix *ctm);
void (*pop_clip)(fz_context *, fz_device *);
@@ -157,9 +157,9 @@ void fz_clip_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, c
void fz_ignore_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_matrix *ctm);
void fz_pop_clip(fz_context *ctx, fz_device *dev);
void fz_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_matrix *ctm, float alpha);
-void fz_fill_image(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, float alpha);
-void fz_fill_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha);
-void fz_clip_image_mask(fz_context *ctx, fz_device *dev, const fz_image *image, const fz_rect *rect, const fz_matrix *ctm);
+void fz_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_matrix *ctm, float alpha);
+void 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);
+void fz_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const fz_rect *rect, const fz_matrix *ctm);
void fz_begin_mask(fz_context *ctx, fz_device *dev, const fz_rect *area, int luminosity, fz_colorspace *colorspace, const float *bc);
void 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);
diff --git a/include/mupdf/fitz/image.h b/include/mupdf/fitz/image.h
index 080352da..699529a2 100644
--- a/include/mupdf/fitz/image.h
+++ b/include/mupdf/fitz/image.h
@@ -34,14 +34,14 @@ typedef struct fz_image_s fz_image;
Returns a non NULL pixmap pointer. May throw exceptions.
*/
-fz_pixmap *fz_get_pixmap_from_image(fz_context *ctx, const fz_image *image, int w, int h);
+fz_pixmap *fz_get_pixmap_from_image(fz_context *ctx, fz_image *image, int w, int h);
/*
fz_drop_image: Drop a reference to an image.
image: The image to drop a reference to.
*/
-void fz_drop_image(fz_context *ctx, const fz_image *image);
+void fz_drop_image(fz_context *ctx, fz_image *image);
/*
fz_keep_image: Increment the reference count of an image.
@@ -50,14 +50,14 @@ void fz_drop_image(fz_context *ctx, const fz_image *image);
Returns a pointer to the image.
*/
-fz_image *fz_keep_image(fz_context *ctx, const fz_image *image);
+fz_image *fz_keep_image(fz_context *ctx, fz_image *image);
fz_image *fz_new_image(fz_context *ctx, int w, int h, int bpc, fz_colorspace *colorspace, int xres, int yres, int interpolate, int imagemask, float *decode, int *colorkey, fz_compressed_buffer *buffer, fz_image *mask);
fz_image *fz_new_image_from_pixmap(fz_context *ctx, fz_pixmap *pixmap, fz_image *mask);
fz_image *fz_new_image_from_data(fz_context *ctx, unsigned char *data, int len);
fz_image *fz_new_image_from_buffer(fz_context *ctx, fz_buffer *buffer);
void fz_drop_image_imp(fz_context *ctx, fz_storable *image);
-fz_pixmap *fz_decomp_image_from_stream(fz_context *ctx, fz_stream *stm, const fz_image *image, int indexed, int l2factor);
+fz_pixmap *fz_decomp_image_from_stream(fz_context *ctx, fz_stream *stm, fz_image *image, int indexed, int l2factor);
fz_pixmap *fz_expand_indexed_pixmap(fz_context *ctx, fz_pixmap *src);
struct fz_image_s
@@ -66,7 +66,7 @@ struct fz_image_s
int w, h, n, bpc;
fz_image *mask;
fz_colorspace *colorspace;
- fz_pixmap *(*get_pixmap)(fz_context *, const fz_image *, int w, int h, int *l2factor);
+ fz_pixmap *(*get_pixmap)(fz_context *, fz_image *, int w, int h, int *l2factor);
int colorkey[FZ_MAX_COLORS * 2];
float decode[FZ_MAX_COLORS * 2];
int imagemask;
diff --git a/include/mupdf/fitz/output-png.h b/include/mupdf/fitz/output-png.h
index 7e0dfb87..dd1ef465 100644
--- a/include/mupdf/fitz/output-png.h
+++ b/include/mupdf/fitz/output-png.h
@@ -29,7 +29,7 @@ void fz_write_png_trailer(fz_context *ctx, fz_output *out, fz_png_output_context
/*
Create a new buffer containing the image/pixmap in PNG format.
*/
-fz_buffer *fz_new_buffer_from_image_as_png(fz_context *ctx, const fz_image *image, int w, int h);
+fz_buffer *fz_new_buffer_from_image_as_png(fz_context *ctx, fz_image *image, int w, int h);
fz_buffer *fz_new_buffer_from_pixmap_as_png(fz_context *ctx, fz_pixmap *pixmap);
#endif