From abee14da6391259e359e222fb51c116dc19d554d Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Wed, 22 Sep 2021 11:39:39 +0100
Subject: [PATCH] Fix compile errors

Fix compile errors in code copied from other image loaders
---
 src/image_load_cr3.c  | 7 ++++---
 src/image_load_j2k.c  | 2 +-
 src/image_load_jpeg.c | 5 +++--
 src/image_load_psd.c  | 5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/image_load_cr3.c b/src/image_load_cr3.c
index 1c3c549c..d40a75cf 100644
--- a/src/image_load_cr3.c
+++ b/src/image_load_cr3.c
@@ -93,7 +93,8 @@ static void
 convert_cmyk_to_rgb (struct jpeg_decompress_struct *cinfo,
 		     guchar **lines)
 {
-	gint i, j;
+	gint i;
+	guint j;
 
 	g_return_if_fail (cinfo != NULL);
 	g_return_if_fail (cinfo->output_components == 4);
@@ -217,7 +218,7 @@ static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
 {
 	struct jpeg_source_mgr* src = (struct jpeg_source_mgr*) cinfo->src;
 
-	if (num_bytes > src->bytes_in_buffer)
+	if ((gulong)num_bytes > src->bytes_in_buffer)
 		{
 		ERREXIT(cinfo, JERR_INPUT_EOF);
 		}
@@ -267,7 +268,7 @@ static gboolean image_loader_cr3_load (gpointer loader, const guchar *buf, gsize
  */
 	gboolean found = FALSE;
 	gint i;
-	gint n;
+	guint n;
 
 	n = 0;
 	while (n < count - 4 && !found)
diff --git a/src/image_load_j2k.c b/src/image_load_j2k.c
index a5312917..37c1b112 100644
--- a/src/image_load_j2k.c
+++ b/src/image_load_j2k.c
@@ -130,7 +130,7 @@ static OPJ_BOOL opj_seek_from_buffer (OPJ_OFF_T len, opj_buffer_info_t* psrc)
 {
     OPJ_SIZE_T n = psrc->len;
 
-    if (n > len)
+    if (n > (gulong)len)
         n = len;
 
     psrc->cur = psrc->buf + n;
diff --git a/src/image_load_jpeg.c b/src/image_load_jpeg.c
index 69f31f50..2bb27a83 100644
--- a/src/image_load_jpeg.c
+++ b/src/image_load_jpeg.c
@@ -96,7 +96,8 @@ static void
 convert_cmyk_to_rgb (struct jpeg_decompress_struct *cinfo,
 		     guchar **lines)
 {
-	gint i, j;
+	gint i;
+	guint j;
 
 	g_return_if_fail (cinfo != NULL);
 	g_return_if_fail (cinfo->output_components == 4);
@@ -220,7 +221,7 @@ static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
 {
 	struct jpeg_source_mgr* src = (struct jpeg_source_mgr*) cinfo->src;
 
-	if (num_bytes > src->bytes_in_buffer)
+	if ((gulong)num_bytes > src->bytes_in_buffer)
 		{
 		ERREXIT(cinfo, JERR_INPUT_EOF);
 		}
diff --git a/src/image_load_psd.c b/src/image_load_psd.c
index a915a015..d37b6e4a 100644
--- a/src/image_load_psd.c
+++ b/src/image_load_psd.c
@@ -185,7 +185,7 @@ feed_buffer (guchar*        buffer,
              guint*         size,
              guint          bytes_needed)
 {
-	gint how_many = bytes_needed - *bytes_read;
+	guint how_many = bytes_needed - *bytes_read;
 	if (how_many > *size) {
 		how_many = *size;
 	}
@@ -293,7 +293,8 @@ static gboolean image_loader_psd_load(gpointer loader, const guchar *buf, gsize
 {
 	ImageLoaderPSD *ld = (ImageLoaderPSD *) loader;
 	PsdContext* ctx = g_new0(PsdContext, 1);
-	int i, j;
+	guint i;
+	guint32 j;
 	guint size = count;
 
 	ctx->state = PSD_STATE_HEADER;
-- 
2.20.1