From 9b714248bc871502d9e80dfcd72404e69fcc234c Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Thu, 13 Jul 2017 18:11:38 +0100 Subject: Fix fz_copy_pixmap_rect to work properly in all cases. --- include/mupdf/fitz/colorspace.h | 8 ++++---- include/mupdf/fitz/pixmap.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/mupdf/fitz/colorspace.h b/include/mupdf/fitz/colorspace.h index aa0e90de..6bd24faa 100644 --- a/include/mupdf/fitz/colorspace.h +++ b/include/mupdf/fitz/colorspace.h @@ -170,9 +170,9 @@ void fz_set_default_rgb(fz_context *ctx, fz_default_colorspaces *default_cs, fz_ void fz_set_default_cmyk(fz_context *ctx, fz_default_colorspaces *default_cs, fz_colorspace *cs); void fz_set_default_output_intent(fz_context *ctx, fz_default_colorspaces *default_cs, fz_colorspace *cs); -fz_colorspace *fz_default_gray(fz_context *ctx, fz_default_colorspaces *default_cs); -fz_colorspace *fz_default_rgb(fz_context *ctx, fz_default_colorspaces *default_cs); -fz_colorspace *fz_default_cmyk(fz_context *ctx, fz_default_colorspaces *default_cs); -fz_colorspace *fz_default_output_intent(fz_context *ctx, fz_default_colorspaces *default_cs); +fz_colorspace *fz_default_gray(fz_context *ctx, const fz_default_colorspaces *default_cs); +fz_colorspace *fz_default_rgb(fz_context *ctx, const fz_default_colorspaces *default_cs); +fz_colorspace *fz_default_cmyk(fz_context *ctx, const fz_default_colorspaces *default_cs); +fz_colorspace *fz_default_output_intent(fz_context *ctx, const fz_default_colorspaces *default_cs); #endif diff --git a/include/mupdf/fitz/pixmap.h b/include/mupdf/fitz/pixmap.h index ffbc27a7..45e12b03 100644 --- a/include/mupdf/fitz/pixmap.h +++ b/include/mupdf/fitz/pixmap.h @@ -336,7 +336,7 @@ struct fz_pixmap_s void fz_drop_pixmap_imp(fz_context *ctx, fz_storable *pix); -void fz_copy_pixmap_rect(fz_context *ctx, fz_pixmap *dest, fz_pixmap *src, const fz_irect *r); +void fz_copy_pixmap_rect(fz_context *ctx, fz_pixmap *dest, fz_pixmap *src, const fz_irect *r, const fz_default_colorspaces *default_cs); void fz_premultiply_pixmap(fz_context *ctx, fz_pixmap *pix); fz_pixmap *fz_alpha_from_gray(fz_context *ctx, fz_pixmap *gray); size_t fz_pixmap_size(fz_context *ctx, fz_pixmap *pix); @@ -361,7 +361,7 @@ void fz_unpack_tile(fz_context *ctx, fz_pixmap *dst, unsigned char * restrict sr fz_pixmap_converter: Color convert a pixmap. The passing of default_cs is needed due to the base cs of the image possibly needing to be treated as being in one of the page default color spaces. */ -typedef void (fz_pixmap_converter)(fz_context *ctx, fz_pixmap *dp, fz_pixmap *sp, fz_colorspace *prf, fz_default_colorspaces *default_cs, const fz_color_params *color_params); +typedef void (fz_pixmap_converter)(fz_context *ctx, fz_pixmap *dp, fz_pixmap *sp, fz_colorspace *prf, const fz_default_colorspaces *default_cs, const fz_color_params *color_params); fz_pixmap_converter *fz_lookup_pixmap_converter(fz_context *ctx, fz_colorspace *ds, fz_colorspace *ss); /* -- cgit v1.2.3