Clean up some compiler warnings.

git-svn-id: svn://svn.tartarus.org/sgt/halibut@8310 cda61777-01e9-0310-a592-d414129be87e

diff --git a/bk_pdf.c b/bk_pdf.c
index d69e833..6f6349e 100644 (file)
--- a/bk_pdf.c
+++ b/bk_pdf.c
@@ -232,7 +232,7 @@ void pdf_backend(paragraph *sourceform, keywordlist *keywords,
                    continue;
                idx = sfnt_glyphtoindex(fe->font->info->fontfile,
                                        fe->vector[i]);
-               if (start >= 0 && idx - startidx == i - start) {
+               if (start >= 0 && idx - startidx == (unsigned)(i - start)) {
                    if (ranges[start] == 1) {
                        nranges++; nchars--;
                    }
@@ -303,7 +303,7 @@ void pdf_backend(paragraph *sourceform, keywordlist *keywords,
            objtext(cidfont, "/FontDescriptor ");
            objref(cidfont, fontdesc);
            objtext(cidfont, "\n/W[0[");
-           for (i = 0; i < sfnt_nglyphs(fe->font->info->fontfile); i++) {
+           for (i = 0; i < (int)sfnt_nglyphs(fe->font->info->fontfile); i++) {
                char buf[20];
                double width;
                width = find_width(fe->font,

diff --git a/deflate.c b/deflate.c
index 8749397..ecae0d0 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -95,7 +95,7 @@
 #define debug_int(x...) ( fprintf(stderr, x) )
 #define debug(x) ( debug_int x )
 #else
-#define debug(x)
+#define debug(x) ((void)0)
 #endif
 
 #ifdef STANDALONE
@@ -1576,11 +1576,11 @@ deflate_compress_ctx *deflate_compress_new(int type)
     {
        int i;
 
-       for (i = 0; i < lenof(out->static_len1); i++)
+       for (i = 0; i < (int)lenof(out->static_len1); i++)
            out->static_len1[i] = (i < 144 ? 8 :
                                   i < 256 ? 9 :
                                   i < 280 ? 7 : 8);
-       for (i = 0; i < lenof(out->static_len2); i++)
+       for (i = 0; i < (int)lenof(out->static_len2); i++)
            out->static_len2[i] = 5;
     }
     hufcodes(out->static_len1, out->static_code1, lenof(out->static_code1));
@@ -2041,7 +2041,8 @@ int deflate_decompress_data(deflate_decompress_ctx *dctx,
 {
     const coderecord *rec;
     const unsigned char *block = (const unsigned char *)vblock;
-    int code, bfinal, btype, rep, dist, nlen, header, cksum;
+    int code, bfinal, btype, rep, dist, nlen, header;
+    unsigned long cksum;
     int error = 0;
 
     if (len == 0) {