Various size_t fixes for MSVC.

diff --git a/source/fitz/memento.c b/source/fitz/memento.c
index 998c026e3712703f27ea59613f8732e490a86939..d6473e944ecf6a35dcac14b66d508cdb1cd94b29 100644 (file)
--- a/source/fitz/memento.c
+++ b/source/fitz/memento.c
@@ -1413,9 +1413,10 @@ int Memento_listBlocksNested(void)
     /* Now, calculate tree */
     for (b = memento.used.head; b; b = b->next) {
         char *p = MEMBLK_TOBLK(b);
-        int end = (b->rawsize < MEMENTO_PTRSEARCH ? b->rawsize : MEMENTO_PTRSEARCH);
-        for (i = MEMENTO_SEARCH_SKIP; i < end; i += sizeof(void *)) {
-            void *q = *(void **)(&p[i]);
+        size_t end = (b->rawsize < MEMENTO_PTRSEARCH ? b->rawsize : MEMENTO_PTRSEARCH);
+        size_t z;
+        for (z = MEMENTO_SEARCH_SKIP; z < end; z += sizeof(void *)) {
+            void *q = *(void **)(&p[z]);
             void **r;
 
             /* Do trivial checks on pointer */

diff --git a/source/html/css-properties.h b/source/html/css-properties.h
index f4c165780fb6e590fd8fc3587b1bc5fd9338148a..0a86fd02d354324597b018f633fff08e8ec11ffa 100644 (file)
--- a/source/html/css-properties.h
+++ b/source/html/css-properties.h
@@ -78,7 +78,7 @@ css_property_hash (register const char *str, register size_t len)
          107, 107, 107, 107, 107, 107, 107, 107, 107, 107,
          107, 107, 107, 107, 107, 107
        };
-  return len + asso_values[(unsigned char)str[1]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];
+  return (unsigned int)(len + asso_values[(unsigned char)str[1]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]]);
 }
 
 static struct css_property_info css_property_list[] =

diff --git a/source/pdf/pdf-form.c b/source/pdf/pdf-form.c
index eac9f7bc02d0384a647790953d0943e736a6d5ca..b8c339fa836e46138ac1b8a6df5b2c7ea3bcb2f7 100644 (file)
--- a/source/pdf/pdf-form.c
+++ b/source/pdf/pdf-form.c
@@ -953,7 +953,7 @@ int pdf_set_text_field_value(fz_context *ctx, pdf_widget *widget, const char *ne
                        event.value = pdf_field_value(ctx, widget->obj);
                        event.change = new_value;
                        event.selStart = 0;
-                       event.selEnd = strlen(event.value);
+                       event.selEnd = (int)strlen(event.value);
                        event.willCommit = 0;
                        rc = pdf_field_event_keystroke(ctx, doc, widget->obj, &event);
                        if (rc)

diff --git a/source/pdf/pdf-signature.c b/source/pdf/pdf-signature.c
index 10350de9fd713352d0a7592535f1df6402300c35..3fc26a124fd8874542ae4d5dfcf24ab178fb86ac 100644 (file)
--- a/source/pdf/pdf-signature.c
+++ b/source/pdf/pdf-signature.c
@@ -319,7 +319,7 @@ char *pdf_signature_format_designated_name(fz_context *ctx, pdf_pkcs7_designated
                ", OU=", name->ou,
                ", emailAddress=", name->email,
                ", C=", name->c};
-       int len = 1;
+       size_t len = 1;
        char *s;
        int i;
 
@@ -340,7 +340,7 @@ char *pdf_signature_format_designated_name(fz_context *ctx, pdf_pkcs7_designated
 pdf_pkcs7_designated_name *pdf_signature_get_signatory(fz_context *ctx, pdf_pkcs7_verifier *verifier, pdf_document *doc, pdf_obj *signature)
 {
        char *contents = NULL;
-       int contents_len = 0;
+       size_t contents_len = 0;
        pdf_pkcs7_designated_name *dn;
 
        contents_len = pdf_signature_contents(ctx, doc, signature, &contents);
@@ -360,7 +360,7 @@ pdf_signature_error pdf_check_digest(fz_context *ctx, pdf_pkcs7_verifier *verifi
        pdf_signature_error result = PDF_SIGNATURE_ERROR_UNKNOWN;
        fz_stream *bytes = NULL;
        char *contents = NULL;
-       int contents_len = pdf_signature_contents(ctx, doc, signature, &contents);
+       size_t contents_len = pdf_signature_contents(ctx, doc, signature, &contents);
        fz_var(bytes);
        fz_try(ctx)
        {

diff --git a/source/svg/svg-parse.c b/source/svg/svg-parse.c
index 1a0a0aa07fdb288052a9e7d0d09a54b1c62a7963..ecb6dc06ed875113d0e7a5f0c6d9416b145a2787 100644 (file)
--- a/source/svg/svg-parse.c
+++ b/source/svg/svg-parse.c
@@ -248,7 +248,7 @@ svg_parse_number_from_style(fz_context *ctx, svg_document *doc, const char *styl
                char *end, *p = strstr(style, att);
                if (p)
                {
-                       int n = strlen(att);
+                       size_t n = strlen(att);
                        if (p[n] == ':')
                        {
                                p += n + 1;
@@ -270,13 +270,13 @@ svg_parse_enum_from_style(fz_context *ctx, svg_document *doc, const char *style,
        int ecount, const char *etable[], int value)
 {
        char buf[100], *end, *p;
-       int i, n;
+       int i;
        if (style)
        {
                p = strstr(style, att);
                if (p)
                {
-                       n = strlen(att);
+                       size_t n = strlen(att);
                        if (p[n] == ':')
                        {
                                p += n + 1;
@@ -305,7 +305,7 @@ svg_parse_string_from_style(fz_context *ctx, svg_document *doc, const char *styl
                p = strstr(style, att);
                if (p)
                {
-                       int n = strlen(att);
+                       size_t n = strlen(att);
                        if (p[n] == ':')
                        {
                                p += n + 1;

diff --git a/source/tools/murun.c b/source/tools/murun.c
index ed8b15481b1a62cb0ccd442fad563505a7da93da..59589d8bf59cd9a1a807d8b88dcc5663a021b2d1 100644 (file)
--- a/source/tools/murun.c
+++ b/source/tools/murun.c
@@ -1648,7 +1648,7 @@ static void push_byte_string(js_State *J, unsigned char *str, size_t len)
                for (i = 0; i < len; ++i)
                {
                        js_pushnumber(J, str[i]);
-                       js_setindex(J, -2, i);
+                       js_setindex(J, -2, (int)i);
                }
        }
 }