diff options
author | Robin Watts <robin.watts@artifex.com> | 2016-06-14 17:06:50 +0100 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2016-06-17 13:24:47 +0100 |
commit | 4a4e6adae4c1a0e9ab3b6fad477edfe26c1a2aca (patch) | |
tree | 4ed45be7545229ce5d8bb124a8332b5444004b1b /source/fitz/load-bmp.c | |
parent | c9bad4ef3e32bc799b134bc3b258f9392cf60e3e (diff) | |
download | mupdf-4a4e6adae4c1a0e9ab3b6fad477edfe26c1a2aca.tar.xz |
Use 'size_t' instead of int as appropriate.
This silences the many warnings we get when building for x64
in windows.
This does not address any of the warnings we get in thirdparty
libraries - in particular harfbuzz. These look (at a quick
glance) harmless though.
Diffstat (limited to 'source/fitz/load-bmp.c')
-rw-r--r-- | source/fitz/load-bmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/fitz/load-bmp.c b/source/fitz/load-bmp.c index 5f23e4fe..5e630b5a 100644 --- a/source/fitz/load-bmp.c +++ b/source/fitz/load-bmp.c @@ -847,7 +847,7 @@ bmp_read_bitmap(fz_context *ctx, struct info *info, unsigned char *p, unsigned c } static fz_pixmap * -bmp_read_image(fz_context *ctx, struct info *info, unsigned char *p, int total, int only_metadata) +bmp_read_image(fz_context *ctx, struct info *info, unsigned char *p, size_t total, int only_metadata) { unsigned char *begin = p; unsigned char *end = p + total; @@ -857,7 +857,7 @@ bmp_read_image(fz_context *ctx, struct info *info, unsigned char *p, int total, p = bmp_read_file_header(ctx, info, p, end); - info->filesize = fz_mini(info->filesize, total); + info->filesize = fz_mini(info->filesize, (int)total); if (end - p < 4) fz_throw(ctx, FZ_ERROR_GENERIC, "premature end in bitmap core header in bmp image"); @@ -936,7 +936,7 @@ bmp_read_image(fz_context *ctx, struct info *info, unsigned char *p, int total, } fz_pixmap * -fz_load_bmp(fz_context *ctx, unsigned char *p, int total) +fz_load_bmp(fz_context *ctx, unsigned char *p, size_t total) { struct info bmp; fz_pixmap *image; @@ -949,7 +949,7 @@ fz_load_bmp(fz_context *ctx, unsigned char *p, int total) } void -fz_load_bmp_info(fz_context *ctx, unsigned char *p, int total, int *wp, int *hp, int *xresp, int *yresp, fz_colorspace **cspacep) +fz_load_bmp_info(fz_context *ctx, unsigned char *p, size_t total, int *wp, int *hp, int *xresp, int *yresp, fz_colorspace **cspacep) { struct info bmp; |