diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2017-08-17 15:01:09 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2017-11-01 13:08:56 +0100 |
| commit | f595e889b91a674eb94db7ca4d832da54f5194cd (patch) | |
| tree | 273b4a7cc465477e428d0c628a19a61301baaae0 /source/fitz/load-jpx.c | |
| parent | 2910531c99e80bede06d2f1460459e8f6ce79961 (diff) | |
| download | mupdf-f595e889b91a674eb94db7ca4d832da54f5194cd.tar.xz | |
Use int64_t for public file API offsets.
Don't mess with conditional compilation with LARGEFILE -- always expose
64-bit file offsets in our public API.
Diffstat (limited to 'source/fitz/load-jpx.c')
| -rw-r--r-- | source/fitz/load-jpx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c index f2751a58..3d7735d5 100644 --- a/source/fitz/load-jpx.c +++ b/source/fitz/load-jpx.c @@ -279,10 +279,10 @@ jpx_read_image(fz_context *ctx, fz_jpxd *state, const unsigned char *data, size_ { err = JP2_Decompress_GetProp(doc, cJP2_Prop_Width, &widths[k], -1, k); if (err != cJP2_Error_OK) - fz_throw(ctx, FZ_ERROR_GENERIC, "cannot get width for component %ld: %d", k, (int) err); + fz_throw(ctx, FZ_ERROR_GENERIC, "cannot get width for component %d: %d", (int) k, (int) err); err = JP2_Decompress_GetProp(doc, cJP2_Prop_Height, &heights[k], -1, k); if (err != cJP2_Error_OK) - fz_throw(ctx, FZ_ERROR_GENERIC, "cannot get height for component %ld: %d", k, (int) err); + fz_throw(ctx, FZ_ERROR_GENERIC, "cannot get height for component %d: %d", (int) k, (int) err); state->width = fz_maxi(state->width, widths[k]); state->height = fz_maxi(state->height, heights[k]); @@ -380,10 +380,10 @@ jpx_read_image(fz_context *ctx, fz_jpxd *state, const unsigned char *data, size_ { err = JP2_Decompress_GetProp(doc, cJP2_Prop_Bits_Per_Sample, &state->bpss[k], -1, k); if (err != cJP2_Error_OK) - fz_throw(ctx, FZ_ERROR_GENERIC, "cannot get bits per sample for component %ld: %d", k, (int) err); + fz_throw(ctx, FZ_ERROR_GENERIC, "cannot get bits per sample for component %d: %d", (int) k, (int) err); err = JP2_Decompress_GetProp(doc, cJP2_Prop_Signed_Samples, &state->signs[k], -1, k); if (err != cJP2_Error_OK) - fz_throw(ctx, FZ_ERROR_GENERIC, "cannot get signed for component %ld: %d", k, (int) err); + fz_throw(ctx, FZ_ERROR_GENERIC, "cannot get signed for component %d: %d", (int) k, (int) err); } if (state->signs[k]) state->signs[k] = 1 << (state->bpss[k] - 1); |