Fix some types

13 files changed, 38 insertions, 36 deletions

diff --git a/lpg/libqr/bitmap.c b/lpg/libqr/bitmap.c
index 759aeca..b9d3763 100644
--- a/lpg/libqr/bitmap.c
+++ b/lpg/libqr/bitmap.c
@@ -5,7 +5,7 @@
 
 #include <qr/bitmap.h>
 
-struct qr_bitmap * qr_bitmap_create(int width, int height, int masked)
+struct qr_bitmap * qr_bitmap_create(size_t width, size_t height, int masked)
 {
         struct qr_bitmap * out;
         size_t size;
@@ -169,9 +169,9 @@ static void render_line_2(unsigned char *       out,
 
 void qr_bitmap_render(const struct qr_bitmap * bmp,
                       void *                   buffer,
-                      size_t                   mod_bits,
+                      int                      mod_bits,
                       size_t                   line_stride,
-                      size_t                   line_repeat,
+                      int                      line_repeat,
                       unsigned long            mark,
                       unsigned long            space)
 {
diff --git a/lpg/libqr/bitstream.c b/lpg/libqr/bitstream.c
index cf5a9d4..cc8a1ae 100644
--- a/lpg/libqr/bitstream.c
+++ b/lpg/libqr/bitstream.c
@@ -121,13 +121,13 @@ size_t qr_bitstream_size(const struct qr_bitstream * stream)
         return stream->count;
 }
 
-unsigned int qr_bitstream_read(struct qr_bitstream * stream, size_t bits)
+unsigned long qr_bitstream_read(struct qr_bitstream * stream, int bits)
 {
-        unsigned int result = 0;
+        unsigned long result = 0;
         unsigned char * byte;
         size_t bitnum;
 
-        assert(qr_bitstream_remaining(stream) >= bits);
+        assert(qr_bitstream_remaining(stream) >= (size_t) bits);
 
         byte = stream->buffer + (stream->pos / CHAR_BIT);
         bitnum = stream->pos % CHAR_BIT;
@@ -149,7 +149,7 @@ unsigned int qr_bitstream_read(struct qr_bitstream * stream, size_t bits)
 void qr_bitstream_unpack(struct qr_bitstream * stream,
                       unsigned int *     result,
                       size_t             count,
-                      size_t             bitsize)
+                      int                bitsize)
 {
         assert(qr_bitstream_remaining(stream) >= (count * bitsize));
 
@@ -158,8 +158,8 @@ void qr_bitstream_unpack(struct qr_bitstream * stream,
 }
 
 int qr_bitstream_write(struct qr_bitstream * stream,
-                    unsigned int       value,
-                    size_t             bits)
+                    unsigned long      value,
+                    int                bits)
 {
         unsigned char * byte;
         size_t bitnum;
@@ -189,7 +189,7 @@ int qr_bitstream_write(struct qr_bitstream * stream,
 int qr_bitstream_pack(struct qr_bitstream *   stream,
                    const unsigned int * values,
                    size_t               count,
-                   size_t               bitsize)
+                   int                  bitsize)
 {
         if (ensure_available(stream, count * bitsize) != 0)
                 return -1;
diff --git a/lpg/libqr/code-common.c b/lpg/libqr/code-common.c
index 1cb1745..babaf86 100644
--- a/lpg/libqr/code-common.c
+++ b/lpg/libqr/code-common.c
@@ -76,7 +76,7 @@ void qr_get_rs_block_sizes(int version,
 
 void qr_mask_apply(struct qr_bitmap * bmp, int mask)
 {
-        int i, j;
+        size_t i, j;
 
         assert((mask & 0x7) == mask);
         mask &= 0x7;
diff --git a/lpg/libqr/code-create.c b/lpg/libqr/code-create.c
index cf04eb7..f9d86a7 100644
--- a/lpg/libqr/code-create.c
+++ b/lpg/libqr/code-create.c
@@ -36,7 +36,7 @@ static void x_dump(struct qr_bitstream * bits)
         qr_bitstream_seek(bits, 0);
         n = qr_bitstream_size(bits);
         for (i = 0; i < n; ++i) {
-                fprintf(stderr, "%d", qr_bitstream_read(bits, 1));
+                fprintf(stderr, "%d", (int) qr_bitstream_read(bits, 1));
                 if (i % 8 == 7)
                         fputc(' ', stderr);
                 if ((i+1) % (7 * 8) == 0)
@@ -173,7 +173,7 @@ static struct qr_bitstream * make_data(int version,
         const size_t total_data = QR_DATA_WORD_COUNT[version - 1][ec ^ 0x1];
         int block_count[2], data_length[2], ec_length[2];
         int total_blocks;
-        size_t i, w;
+        int i, w;
         struct qr_bitstream * dcopy = 0;
         struct qr_bitstream * out = 0;
         struct qr_bitstream ** blocks = 0;
@@ -296,7 +296,7 @@ struct qr_code * qr_code_create(const struct qr_data * data)
                 goto fail;
 
         qr_bitstream_seek(bits, 0);
-        while (qr_bitstream_remaining(bits) >= QR_WORD_BITS)
+        while (qr_bitstream_remaining(bits) >= (size_t) QR_WORD_BITS)
                 qr_layout_write(layout, qr_bitstream_read(bits, QR_WORD_BITS));
         qr_layout_end(layout);
 
@@ -370,7 +370,8 @@ static int score_mask(const struct qr_bitmap * bmp)
 static int score_runs(const struct qr_bitmap * bmp, int base)
 {
         /* Runs of 5+n bits -> N[0] + i */
-        int x, y, flip;
+        size_t x, y;
+        int flip;
         int score = 0;
         int count, last;
 
@@ -406,7 +407,7 @@ static int score_runs(const struct qr_bitmap * bmp, int base)
 static int count_2blocks(const struct qr_bitmap * bmp)
 {
         /* Count the number of 2x2 blocks (on or off) */
-        int x, y;
+        size_t x, y;
         int count = 0;
 
         /* Slow and stupid */
@@ -435,7 +436,8 @@ static int count_2blocks(const struct qr_bitmap * bmp)
 static int count_locators(const struct qr_bitmap * bmp)
 {
         /* 1:1:3:1:1 patterns -> N[2] */
-        int x, y, flip;
+        size_t x, y;
+        int flip;
         int count = 0;
 
         for (flip = 0; flip <= 1; ++flip) {
@@ -469,7 +471,7 @@ static int count_locators(const struct qr_bitmap * bmp)
 static int calc_bw_balance(const struct qr_bitmap * bmp)
 {
         /* Calculate the proportion (in percent) of "on" bits */
-        int x, y;
+        size_t x, y;
         unsigned char bit;
         long on, total;
 
diff --git a/lpg/libqr/code-layout.c b/lpg/libqr/code-layout.c
index 8b4522d..fe8caa7 100644
--- a/lpg/libqr/code-layout.c
+++ b/lpg/libqr/code-layout.c
@@ -21,11 +21,11 @@ struct qr_iterator {
 
 void qr_layout_init_mask(struct qr_code * code)
 {
-        int x, y;
-        int dim = qr_code_width(code);
+        size_t x, y;
+        size_t dim = qr_code_width(code);
         struct qr_bitmap * bmp = code->modules;
         const int * am_pos = QR_ALIGNMENT_LOCATION[code->version - 1];
-        int am_side;
+        size_t am_side;
 
         if (!bmp->mask)
                 qr_bitmap_add_mask(bmp);
diff --git a/lpg/libqr/code-parse.c b/lpg/libqr/code-parse.c
index d4a2538..3fca4b2 100644
--- a/lpg/libqr/code-parse.c
+++ b/lpg/libqr/code-parse.c
@@ -111,7 +111,7 @@ static int read_bits(const struct qr_code * code,
         const size_t total_words = total_bits / QR_WORD_BITS;
         struct qr_bitstream * raw_bits;
         struct qr_iterator * layout;
-        int w;
+        size_t w;
         int ret = -1;
 
         raw_bits = qr_bitstream_create();
@@ -292,7 +292,7 @@ cleanup:
         return status;
 }
 
-int qr_decode_format(unsigned bits, enum qr_ec_level * ec, int * mask)
+int qr_decode_format(unsigned long bits, enum qr_ec_level * ec, int * mask)
 {
         bits ^= QR_FORMAT_MASK;
 
diff --git a/lpg/libqr/constants.h b/lpg/libqr/constants.h
index c13ae5a..b1f7493 100644
--- a/lpg/libqr/constants.h
+++ b/lpg/libqr/constants.h
@@ -17,7 +17,7 @@ static const unsigned int QR_FORMAT_POLY = 0x537;
 static const unsigned int QR_VERSION_POLY = 0x1F25;
 
 /* A QR-code word is always 8 bits, but CHAR_BIT might not be */
-static const unsigned int QR_WORD_BITS = 8;
+static const int QR_WORD_BITS = 8;
 
 extern const int QR_ALIGNMENT_LOCATION[40][7];
 extern const int QR_DATA_WORD_COUNT[40][4];
diff --git a/lpg/libqr/data-create.c b/lpg/libqr/data-create.c
index 9d6c384..6437bc1 100644
--- a/lpg/libqr/data-create.c
+++ b/lpg/libqr/data-create.c
@@ -175,7 +175,7 @@ static int calc_min_version(enum qr_data_type type,
 
         for (version = 1; version <= 40; ++version) {
                 if (4 + dbits + qr_data_size_field_length(version, type)
-                    < 8 * QR_DATA_WORD_COUNT[version - 1][ec ^ 0x1])
+                    < 8 * (size_t) QR_DATA_WORD_COUNT[version - 1][ec ^ 0x1])
                         return version;
         }
 
diff --git a/lpg/libqr/galois.c b/lpg/libqr/galois.c
index f0aadfd..decefb0 100644
--- a/lpg/libqr/galois.c
+++ b/lpg/libqr/galois.c
@@ -83,7 +83,7 @@ struct qr_bitstream * rs_generate_words(struct qr_bitstream * data,
         unsigned int * b = 0;
         unsigned int * g;
         size_t n = rs_words;
-        int i, r;
+        size_t i, r;
 
         assert(qr_bitstream_remaining(data) >= data_words * 8);
 
diff --git a/lpg/libqr/qr/bitmap.h b/lpg/libqr/qr/bitmap.h
index 36c56b3..d4af471 100644
--- a/lpg/libqr/qr/bitmap.h
+++ b/lpg/libqr/qr/bitmap.h
@@ -8,7 +8,7 @@ struct qr_bitmap {
         size_t width, height;
 };
 
-struct qr_bitmap * qr_bitmap_create(int width, int height, int masked);
+struct qr_bitmap * qr_bitmap_create(size_t width, size_t height, int masked);
 void qr_bitmap_destroy(struct qr_bitmap *);
 
 int qr_bitmap_add_mask(struct qr_bitmap *);
@@ -19,9 +19,9 @@ void qr_bitmap_merge(struct qr_bitmap * dest, const struct qr_bitmap * src);
 
 void qr_bitmap_render(const struct qr_bitmap * bmp,
                       void *                   buffer,
-                      size_t                   mod_bits,
+                      int                      mod_bits,
                       size_t                   line_stride,
-                      size_t                   line_repeat,
+                      int                      line_repeat,
                       unsigned long            mark,
                       unsigned long            space);
 
diff --git a/lpg/libqr/qr/bitstream.h b/lpg/libqr/qr/bitstream.h
index 5ca6b41..9bd8261 100644
--- a/lpg/libqr/qr/bitstream.h
+++ b/lpg/libqr/qr/bitstream.h
@@ -22,21 +22,21 @@ size_t qr_bitstream_tell(const struct qr_bitstream *);
 size_t qr_bitstream_remaining(const struct qr_bitstream *);
 size_t qr_bitstream_size(const struct qr_bitstream *);
 
-unsigned int qr_bitstream_read(struct qr_bitstream *, size_t bits);
+unsigned long qr_bitstream_read(struct qr_bitstream *, int bits);
 
 void qr_bitstream_unpack(struct qr_bitstream *,
                          unsigned int * result,
                          size_t         count,
-                         size_t         bitsize);
+                         int            bitsize);
 
 int qr_bitstream_write(struct qr_bitstream *,
-                       unsigned int value,
-                       size_t       bits);
+                       unsigned long value,
+                       int bits);
 
 int qr_bitstream_pack(struct qr_bitstream *,
                       const unsigned int * values,
                       size_t               count,
-                      size_t               bitsize);
+                      int                  bitsize);
 
 int qr_bitstream_cat(struct qr_bitstream *,
                      const struct qr_bitstream * src);
diff --git a/lpg/libqr/qr/parse.h b/lpg/libqr/qr/parse.h
index d7b8c4e..07a0424 100644
--- a/lpg/libqr/qr/parse.h
+++ b/lpg/libqr/qr/parse.h
@@ -9,7 +9,7 @@ int qr_code_parse(const void *      buffer,
                   size_t            line_count,
                   struct qr_data ** data);
 
-int qr_decode_format(unsigned bits, enum qr_ec_level * ec, int * mask);
+int qr_decode_format(unsigned long bits, enum qr_ec_level * ec, int * mask);
 int qr_decode_version(unsigned long bits, int * version);
 
 #endif
diff --git a/lpg/libqr/qrgen.c b/lpg/libqr/qrgen.c
index 6098231..3007011 100644
--- a/lpg/libqr/qrgen.c
+++ b/lpg/libqr/qrgen.c
@@ -100,7 +100,7 @@ void output_ansi(const struct qr_bitmap * bmp)
         };
 
         unsigned char * line;
-        int x, y;
+        size_t x, y;
 
         line = bmp->bits;