diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2016-01-21 12:55:36 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2016-01-21 12:55:36 +0100 |
commit | 6625a5b82671df7e79afc69a2ba366fb64df03a9 (patch) | |
tree | b8bc2694b269fce2dc7c1e00ead0f47590993419 /include | |
parent | 000b8df004b175781af5b071590cf3867ae16f3a (diff) | |
download | mupdf-6625a5b82671df7e79afc69a2ba366fb64df03a9.tar.xz |
Drop const from fz_colorspace.
It's an opaque immutable structure, that we don't expect to ever want
to change after creation. Therefore the const keyword is not useful,
and is only line noise.
Diffstat (limited to 'include')
-rw-r--r-- | include/mupdf/fitz/colorspace.h | 20 | ||||
-rw-r--r-- | include/mupdf/fitz/device.h | 24 | ||||
-rw-r--r-- | include/mupdf/pdf/resource.h | 2 |
3 files changed, 23 insertions, 23 deletions
diff --git a/include/mupdf/fitz/colorspace.h b/include/mupdf/fitz/colorspace.h index 0839e0eb..b1b82999 100644 --- a/include/mupdf/fitz/colorspace.h +++ b/include/mupdf/fitz/colorspace.h @@ -74,19 +74,19 @@ struct fz_colorspace_s unsigned int size; char name[16]; int n; - void (*to_rgb)(fz_context *ctx, const fz_colorspace *, const float *src, float *rgb); - void (*from_rgb)(fz_context *ctx, const fz_colorspace *, const float *rgb, float *dst); - void (*free_data)(fz_context *Ctx, const fz_colorspace *); + void (*to_rgb)(fz_context *ctx, fz_colorspace *, const float *src, float *rgb); + void (*from_rgb)(fz_context *ctx, fz_colorspace *, const float *rgb, float *dst); + void (*free_data)(fz_context *Ctx, fz_colorspace *); void *data; }; fz_colorspace *fz_new_colorspace(fz_context *ctx, char *name, int n); fz_colorspace *fz_new_indexed_colorspace(fz_context *ctx, fz_colorspace *base, int high, unsigned char *lookup); -fz_colorspace *fz_keep_colorspace(fz_context *ctx, const fz_colorspace *colorspace); -void fz_drop_colorspace(fz_context *ctx, const fz_colorspace *colorspace); +fz_colorspace *fz_keep_colorspace(fz_context *ctx, fz_colorspace *colorspace); +void fz_drop_colorspace(fz_context *ctx, fz_colorspace *colorspace); void fz_drop_colorspace_imp(fz_context *ctx, fz_storable *colorspace); -void fz_convert_color(fz_context *ctx, const fz_colorspace *dsts, float *dstv, const fz_colorspace *srcs, const float *srcv); +void fz_convert_color(fz_context *ctx, fz_colorspace *dsts, float *dstv, fz_colorspace *srcs, const float *srcv); void fz_new_colorspace_context(fz_context *ctx); fz_colorspace_context *fz_keep_colorspace_context(fz_context *ctx); @@ -101,14 +101,14 @@ typedef struct fz_color_converter_s fz_color_converter; struct fz_color_converter_s { void (*convert)(fz_context *, fz_color_converter *, float *, const float *); - const fz_colorspace *ds; - const fz_colorspace *ss; + fz_colorspace *ds; + fz_colorspace *ss; void *opaque; }; -void fz_lookup_color_converter(fz_context *ctx, fz_color_converter *cc, const fz_colorspace *ds, const fz_colorspace *ss); +void fz_lookup_color_converter(fz_context *ctx, fz_color_converter *cc, fz_colorspace *ds, fz_colorspace *ss); -void fz_init_cached_color_converter(fz_context *ctx, fz_color_converter *cc, const fz_colorspace *ds, const fz_colorspace *ss); +void fz_init_cached_color_converter(fz_context *ctx, fz_color_converter *cc, fz_colorspace *ds, fz_colorspace *ss); void fz_fin_cached_color_converter(fz_context *ctx, fz_color_converter *cc); #endif diff --git a/include/mupdf/fitz/device.h b/include/mupdf/fitz/device.h index 8c2c0219..c7ce7b61 100644 --- a/include/mupdf/fitz/device.h +++ b/include/mupdf/fitz/device.h @@ -106,25 +106,25 @@ struct fz_device_s void (*begin_page)(fz_context *, fz_device *, const fz_rect *rect, const fz_matrix *ctm); void (*end_page)(fz_context *, fz_device *); - void (*fill_path)(fz_context *, fz_device *, const fz_path *, int even_odd, const fz_matrix *, const fz_colorspace *, const float *color, float alpha); - void (*stroke_path)(fz_context *, fz_device *, const fz_path *, const fz_stroke_state *, const fz_matrix *, const fz_colorspace *, const float *color, float alpha); + void (*fill_path)(fz_context *, fz_device *, const fz_path *, int even_odd, const fz_matrix *, fz_colorspace *, const float *color, float alpha); + void (*stroke_path)(fz_context *, fz_device *, const fz_path *, const fz_stroke_state *, const fz_matrix *, fz_colorspace *, const float *color, float alpha); void (*clip_path)(fz_context *, fz_device *, const fz_path *, const fz_rect *rect, int even_odd, const fz_matrix *); void (*clip_stroke_path)(fz_context *, fz_device *, const fz_path *, const fz_rect *rect, const fz_stroke_state *, const fz_matrix *); - void (*fill_text)(fz_context *, fz_device *, const fz_text *, const fz_matrix *, const fz_colorspace *, const float *color, float alpha); - void (*stroke_text)(fz_context *, fz_device *, const fz_text *, const fz_stroke_state *, const fz_matrix *, const fz_colorspace *, const float *color, float alpha); + void (*fill_text)(fz_context *, fz_device *, const fz_text *, const fz_matrix *, fz_colorspace *, const float *color, float alpha); + void (*stroke_text)(fz_context *, fz_device *, const fz_text *, const fz_stroke_state *, const fz_matrix *, fz_colorspace *, const float *color, float alpha); void (*clip_text)(fz_context *, fz_device *, const fz_text *, const fz_matrix *); void (*clip_stroke_text)(fz_context *, fz_device *, const fz_text *, const fz_stroke_state *, const fz_matrix *); void (*ignore_text)(fz_context *, fz_device *, const fz_text *, const fz_matrix *); void (*fill_shade)(fz_context *, fz_device *, const 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, const fz_colorspace *, const float *color, 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 (*pop_clip)(fz_context *, fz_device *); - void (*begin_mask)(fz_context *, fz_device *, const fz_rect *, int luminosity, const fz_colorspace *, const float *bc); + void (*begin_mask)(fz_context *, fz_device *, const fz_rect *, int luminosity, fz_colorspace *, const float *bc); void (*end_mask)(fz_context *, fz_device *); void (*begin_group)(fz_context *, fz_device *, const fz_rect *, int isolated, int knockout, int blendmode, float alpha); void (*end_group)(fz_context *, fz_device *); @@ -146,21 +146,21 @@ struct fz_device_s void fz_begin_page(fz_context *ctx, fz_device *dev, const fz_rect *rect, const fz_matrix *ctm); void fz_end_page(fz_context *ctx, fz_device *dev); -void fz_fill_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, const fz_matrix *ctm, const fz_colorspace *colorspace, const float *color, float alpha); -void fz_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_stroke_state *stroke, const fz_matrix *ctm, const fz_colorspace *colorspace, const float *color, float alpha); +void fz_fill_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha); +void fz_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_stroke_state *stroke, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha); void fz_clip_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_rect *rect, int even_odd, const fz_matrix *ctm); void fz_clip_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_rect *rect, const fz_stroke_state *stroke, const fz_matrix *ctm); -void fz_fill_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_matrix *ctm, const fz_colorspace *colorspace, const float *color, float alpha); -void fz_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *stroke, const fz_matrix *ctm, const fz_colorspace *colorspace, const float *color, float alpha); +void fz_fill_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha); +void fz_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *stroke, const fz_matrix *ctm, fz_colorspace *colorspace, const float *color, float alpha); void fz_clip_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_matrix *ctm); void fz_clip_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *stroke, const fz_matrix *ctm); 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, const 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, const fz_colorspace *colorspace, const float *color, 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_begin_mask(fz_context *ctx, fz_device *dev, const fz_rect *area, int luminosity, const fz_colorspace *colorspace, const float *bc); +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); void fz_end_group(fz_context *ctx, fz_device *dev); diff --git a/include/mupdf/pdf/resource.h b/include/mupdf/pdf/resource.h index a97b9b84..868bd168 100644 --- a/include/mupdf/pdf/resource.h +++ b/include/mupdf/pdf/resource.h @@ -15,7 +15,7 @@ void pdf_remove_item(fz_context *ctx, fz_store_drop_fn *drop, pdf_obj *key); fz_function *pdf_load_function(fz_context *ctx, pdf_document *doc, pdf_obj *ref, int in, int out); fz_colorspace *pdf_load_colorspace(fz_context *ctx, pdf_document *doc, pdf_obj *obj); -int pdf_is_tint_colorspace(fz_context *ctx, const fz_colorspace *cs); +int pdf_is_tint_colorspace(fz_context *ctx, fz_colorspace *cs); fz_shade *pdf_load_shading(fz_context *ctx, pdf_document *doc, pdf_obj *obj); |