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.

3 files changed, 5 insertions, 5 deletions

diff --git a/source/xps/xps-glyphs.c b/source/xps/xps-glyphs.c
index 9110c169..de153dc2 100644
--- a/source/xps/xps-glyphs.c
+++ b/source/xps/xps-glyphs.c
@@ -354,7 +354,7 @@ xps_parse_glyphs_imp(fz_context *ctx, xps_document *doc, const fz_matrix *ctm,
 	float y = originy;
 	char *us = unicode;
 	char *is = indices;
-	int un = 0;
+	size_t un = 0;
 
 	if (!unicode && !indices)
 		fz_warn(ctx, "glyphs element with neither characters nor indices");
diff --git a/source/xps/xps-util.c b/source/xps/xps-util.c
index 5d708eaa..c7def9f4 100644
--- a/source/xps/xps-util.c
+++ b/source/xps/xps-util.c
@@ -148,7 +148,7 @@ xps_resolve_url(fz_context *ctx, xps_document *doc, char *output, char *base_uri
 	}
 	else
 	{
-		int len = fz_strlcpy(output, base_uri, output_size);
+		size_t len = fz_strlcpy(output, base_uri, output_size);
 		if (len == 0 || output[len-1] != '/')
 			fz_strlcat(output, "/", output_size);
 		fz_strlcat(output, path, output_size);
diff --git a/source/xps/xps-zip.c b/source/xps/xps-zip.c
index d359213d..b0c4403a 100644
--- a/source/xps/xps-zip.c
+++ b/source/xps/xps-zip.c
@@ -3,7 +3,7 @@
 static void xps_init_document(fz_context *ctx, xps_document *doc);
 
 xps_part *
-xps_new_part(fz_context *ctx, xps_document *doc, char *name, unsigned char *data, int size)
+xps_new_part(fz_context *ctx, xps_document *doc, char *name, unsigned char *data, size_t size)
 {
 	xps_part *part;
 
@@ -43,7 +43,7 @@ xps_read_part(fz_context *ctx, xps_document *doc, char *partname)
 	fz_buffer *buf, *tmp;
 	char path[2048];
 	unsigned char *data;
-	int size;
+	size_t size;
 	int count;
 	char *name;
 	int seen_last;
@@ -224,7 +224,7 @@ static int
 xps_lookup_metadata(fz_context *ctx, xps_document *doc, const char *key, char *buf, int size)
 {
 	if (!strcmp(key, "format"))
-		return fz_strlcpy(buf, "XPS", size);
+		return (int)fz_strlcpy(buf, "XPS", size);
 	return -1;
 }