summaryrefslogtreecommitdiff
path: root/source/fitz/load-jxr.c
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2017-10-11 14:02:57 +0200
committerTor Andersson <tor.andersson@artifex.com>2017-10-12 15:18:06 +0200
commit0e03d243af21da13af66af6c688300ff7d72ade6 (patch)
treebb86c7d131ccd0c7b78be85bdc100eaa5c744245 /source/fitz/load-jxr.c
parent1246b9c7fa031c3db8f0bfaeb7be367636d7cdec (diff)
downloadmupdf-0e03d243af21da13af66af6c688300ff7d72ade6.tar.xz
Make image loading use const data pointers.
Diffstat (limited to 'source/fitz/load-jxr.c')
-rw-r--r--source/fitz/load-jxr.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/fitz/load-jxr.c b/source/fitz/load-jxr.c
index d81196c2..a83d7f6a 100644
--- a/source/fitz/load-jxr.c
+++ b/source/fitz/load-jxr.c
@@ -274,7 +274,7 @@ jxr_decode_block_alpha(jxr_image_t image, int mx, int my, int *data)
}
static void
-jxr_read_image(fz_context *ctx, unsigned char *data, int size, struct info *info, int only_metadata)
+jxr_read_image(fz_context *ctx, const unsigned char *data, int size, struct info *info, int only_metadata)
{
jxr_container_t container;
jxr_image_t image = NULL;
@@ -285,7 +285,7 @@ jxr_read_image(fz_context *ctx, unsigned char *data, int size, struct info *info
{
container = jxr_create_container();
- rc = jxr_read_image_container_memory(container, data, size);
+ rc = jxr_read_image_container_memory(container, (unsigned char *)data, size);
if (rc < 0)
fz_throw(ctx, FZ_ERROR_GENERIC, "cannot read jxr image container: %s", jxr_error_string(rc));
@@ -342,7 +342,7 @@ jxr_read_image(fz_context *ctx, unsigned char *data, int size, struct info *info
jxr_set_user_data(image, info);
jxr_set_block_output(image, jxr_decode_block);
- rc = jxr_read_image_bitstream_memory(image, data + image_offset, size - image_offset);
+ rc = jxr_read_image_bitstream_memory(image, (unsigned char *)data + image_offset, size - image_offset);
if (rc < 0)
fz_throw(ctx, FZ_ERROR_GENERIC, "cannot read jxr image: %s", jxr_error_string(rc));
@@ -370,7 +370,7 @@ jxr_read_image(fz_context *ctx, unsigned char *data, int size, struct info *info
jxr_set_user_data(alpha, info);
jxr_set_block_output(alpha, jxr_decode_block_alpha);
- rc = jxr_read_image_bitstream_memory(alpha, data + alpha_offset, size - alpha_offset);
+ rc = jxr_read_image_bitstream_memory(alpha, (unsigned char *)data + alpha_offset, size - alpha_offset);
if (rc < 0)
fz_throw(ctx, FZ_ERROR_GENERIC, "cannot read jxr image: %s", jxr_error_string(rc));
}
@@ -391,7 +391,7 @@ jxr_read_image(fz_context *ctx, unsigned char *data, int size, struct info *info
}
fz_pixmap *
-fz_load_jxr(fz_context *ctx, unsigned char *data, size_t size)
+fz_load_jxr(fz_context *ctx, const unsigned char *data, size_t size)
{
struct info info = { 0 };
fz_pixmap *image = NULL;
@@ -426,7 +426,7 @@ fz_load_jxr(fz_context *ctx, unsigned char *data, size_t size)
}
void
-fz_load_jxr_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int *hp, int *xresp, int *yresp, fz_colorspace **cspacep)
+fz_load_jxr_info(fz_context *ctx, const unsigned char *data, size_t size, int *wp, int *hp, int *xresp, int *yresp, fz_colorspace **cspacep)
{
struct info info = { 0 };
@@ -441,13 +441,13 @@ fz_load_jxr_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
#else /* HAVE_JPEGXR */
fz_pixmap *
-fz_load_jxr(fz_context *ctx, unsigned char *data, size_t size)
+fz_load_jxr(fz_context *ctx, const unsigned char *data, size_t size)
{
fz_throw(ctx, FZ_ERROR_GENERIC, "JPEG-XR codec is not available");
}
void
-fz_load_jxr_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int *hp, int *xresp, int *yresp, fz_colorspace **cspacep)
+fz_load_jxr_info(fz_context *ctx, const unsigned char *data, size_t size, int *wp, int *hp, int *xresp, int *yresp, fz_colorspace **cspacep)
{
fz_throw(ctx, FZ_ERROR_GENERIC, "JPEG-XR codec is not available");
}