From 228301373f5b1adacf775dff26ff69bb10b5efa6 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 14 May 2020 06:57:15 +1000
Subject: [PATCH] Fixed comparison warnings

---
 src/libImaging/Jpeg.h          | 2 +-
 src/libImaging/Jpeg2KEncode.c  | 6 +++---
 src/libImaging/QuantPngQuant.c | 4 ++--
 src/libImaging/QuantPngQuant.h | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libImaging/Jpeg.h b/src/libImaging/Jpeg.h
index df6d8a903..280b6d638 100644
--- a/src/libImaging/Jpeg.h
+++ b/src/libImaging/Jpeg.h
@@ -110,7 +110,7 @@ typedef struct {
 
     int extra_offset;
 
-    int rawExifLen;   /* EXIF data length */
+    size_t rawExifLen;   /* EXIF data length */
     char* rawExif;  /* EXIF buffer pointer */
 
 } JPEGENCODERSTATE;
diff --git a/src/libImaging/Jpeg2KEncode.c b/src/libImaging/Jpeg2KEncode.c
index 49ef5e254..5b18e472c 100644
--- a/src/libImaging/Jpeg2KEncode.c
+++ b/src/libImaging/Jpeg2KEncode.c
@@ -50,7 +50,7 @@ static OPJ_SIZE_T
 j2k_write(void *p_buffer, OPJ_SIZE_T p_nb_bytes, void *p_user_data)
 {
     ImagingCodecState state = (ImagingCodecState)p_user_data;
-    int result;
+    unsigned int result;
 
     result = _imaging_write_pyFd(state->fd, p_buffer, p_nb_bytes);
 
@@ -399,8 +399,8 @@ j2k_encode_entry(Imaging im, ImagingCodecState state)
         Py_ssize_t n;
         float *pq;
 
-        if (len) {
-            if (len > sizeof(params.tcp_rates) / sizeof(params.tcp_rates[0])) {
+        if (len > 0) {
+            if ((unsigned)len > sizeof(params.tcp_rates) / sizeof(params.tcp_rates[0])) {
                 len = sizeof(params.tcp_rates)/sizeof(params.tcp_rates[0]);
             }
 
diff --git a/src/libImaging/QuantPngQuant.c b/src/libImaging/QuantPngQuant.c
index ef40b282b..753ceb02f 100644
--- a/src/libImaging/QuantPngQuant.c
+++ b/src/libImaging/QuantPngQuant.c
@@ -20,8 +20,8 @@
 int
 quantize_pngquant(
     Pixel *pixelData,
-    int width,
-    int height,
+    unsigned int width,
+    unsigned int height,
     uint32_t quantPixels,
     Pixel **palette,
     uint32_t *paletteLength,
diff --git a/src/libImaging/QuantPngQuant.h b/src/libImaging/QuantPngQuant.h
index d539a7a0d..fb0b4cc03 100644
--- a/src/libImaging/QuantPngQuant.h
+++ b/src/libImaging/QuantPngQuant.h
@@ -4,8 +4,8 @@
 #include "QuantTypes.h"
 
 int quantize_pngquant(Pixel *,
-    int,
-    int,
+    unsigned int,
+    unsigned int,
     uint32_t,
     Pixel **,
     uint32_t *,