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/zip.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/zip.c')
-rw-r--r-- | source/fitz/zip.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/fitz/zip.c b/source/fitz/zip.c index 285fb635..dd67e5ac 100644 --- a/source/fitz/zip.c +++ b/source/fitz/zip.c @@ -24,7 +24,7 @@ fz_write_zip_entry(fz_context *ctx, fz_zip_writer *zip, const char *name, fz_buf int sum; sum = crc32(0, NULL, 0); - sum = crc32(sum, buf->data, buf->len); + sum = crc32(sum, buf->data, (uInt)buf->len); fz_write_buffer_int32_le(ctx, zip->central, ZIP_CENTRAL_DIRECTORY_SIG); fz_write_buffer_int16_le(ctx, zip->central, 0); /* version made by: MS-DOS */ @@ -34,9 +34,9 @@ fz_write_zip_entry(fz_context *ctx, fz_zip_writer *zip, const char *name, fz_buf fz_write_buffer_int16_le(ctx, zip->central, 0); /* TODO: last mod file time */ fz_write_buffer_int16_le(ctx, zip->central, 0); /* TODO: last mod file date */ fz_write_buffer_int32_le(ctx, zip->central, sum); /* crc-32 */ - fz_write_buffer_int32_le(ctx, zip->central, buf->len); /* csize */ - fz_write_buffer_int32_le(ctx, zip->central, buf->len); /* usize */ - fz_write_buffer_int16_le(ctx, zip->central, strlen(name)); /* file name length */ + fz_write_buffer_int32_le(ctx, zip->central, (int)buf->len); /* csize */ + fz_write_buffer_int32_le(ctx, zip->central, (int)buf->len); /* usize */ + fz_write_buffer_int16_le(ctx, zip->central, (int)strlen(name)); /* file name length */ fz_write_buffer_int16_le(ctx, zip->central, 0); /* extra field length */ fz_write_buffer_int16_le(ctx, zip->central, 0); /* file comment length */ fz_write_buffer_int16_le(ctx, zip->central, 0); /* disk number start */ @@ -52,9 +52,9 @@ fz_write_zip_entry(fz_context *ctx, fz_zip_writer *zip, const char *name, fz_buf fz_write_int16_le(ctx, zip->output, 0); /* TODO: last mod file time */ fz_write_int16_le(ctx, zip->output, 0); /* TODO: last mod file date */ fz_write_int32_le(ctx, zip->output, sum); /* crc-32 */ - fz_write_int32_le(ctx, zip->output, buf->len); /* csize */ - fz_write_int32_le(ctx, zip->output, buf->len); /* usize */ - fz_write_int16_le(ctx, zip->output, strlen(name)); /* file name length */ + fz_write_int32_le(ctx, zip->output, (int)buf->len); /* csize */ + fz_write_int32_le(ctx, zip->output, (int)buf->len); /* usize */ + fz_write_int16_le(ctx, zip->output, (int)strlen(name)); /* file name length */ fz_write_int16_le(ctx, zip->output, 0); /* extra field length */ fz_write(ctx, zip->output, name, strlen(name)); fz_write(ctx, zip->output, buf->data, buf->len); @@ -67,7 +67,7 @@ fz_drop_zip_writer(fz_context *ctx, fz_zip_writer *zip) { fz_try(ctx) { - int offset = fz_tell_output(ctx, zip->output); + fz_off_t offset = fz_tell_output(ctx, zip->output); fz_write(ctx, zip->output, zip->central->data, zip->central->len); @@ -76,8 +76,8 @@ fz_drop_zip_writer(fz_context *ctx, fz_zip_writer *zip) fz_write_int16_le(ctx, zip->output, 0); /* number of disk where central directory starts */ fz_write_int16_le(ctx, zip->output, zip->count); /* entries in central directory in this disk */ fz_write_int16_le(ctx, zip->output, zip->count); /* entries in central directory in total */ - fz_write_int32_le(ctx, zip->output, zip->central->len); /* size of the central directory */ - fz_write_int32_le(ctx, zip->output, offset); /* offset of the central directory */ + fz_write_int32_le(ctx, zip->output, (int)zip->central->len); /* size of the central directory */ + fz_write_int32_le(ctx, zip->output, (int)offset); /* offset of the central directory */ fz_write_int16_le(ctx, zip->output, 5); /* zip file comment length */ fz_write(ctx, zip->output, "MuPDF", 5); |