From ff881377d8b5cf9bc7cc69ced6b301e12e97ace8 Mon Sep 17 00:00:00 2001
From: Phil Pemberton <philpem@philpem.me.uk>
Date: Tue, 26 May 2020 18:13:27 +0100
Subject: [PATCH] Fix upstream #3, bring in marcespie's G4 patch

Fix a clang warning which is also a bug. Thanks to @marcespie for the
patch.

Fixes upstream issue #3
---
 bitblt_g4.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bitblt_g4.c b/bitblt_g4.c
index 41addad..d76cd0c 100644
--- a/bitblt_g4.c
+++ b/bitblt_g4.c
@@ -215,6 +215,7 @@ static uint32_t g4_find_pixel (uint8_t *buf,
   return (width);
 }
 
+#define absdiff(a, b) ((a) < (b) ? (b)-(a) : (a) - (b))
 
 static void g4_encode_row (struct bit_buffer *buf,
 			   uint32_t width,
@@ -253,7 +254,7 @@ static void g4_encode_row (struct bit_buffer *buf,
 	  fprintf (stderr, "pass\n");
 #endif
 	}
-      else if (abs (a1 - b1) <= 3)
+      else if (absdiff(a1, b1) <= 3)
 	{
 	  /* vertical mode */
 	  write_bits (buf,