From aa917decf3a7d238f42ec42b88ec581a56cf23c7 Mon Sep 17 00:00:00 2001
From: Andri Yngvason <andri@yngvason.is>
Date: Sun, 19 Jan 2020 21:30:49 +0000
Subject: [PATCH] pixels: Make it work for 4 bytes per cpixel

---
 src/pixels.c | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/pixels.c b/src/pixels.c
index ba2a4c6..da361f3 100644
--- a/src/pixels.c
+++ b/src/pixels.c
@@ -47,10 +47,6 @@ void pixel32_to_cpixel(uint8_t* restrict dst,
 	uint32_t src_green_max = src_fmt->green_max;
 	uint32_t src_blue_max = src_fmt->blue_max;
 
-	uint32_t dst_red_max = dst_fmt->red_max;
-	uint32_t dst_green_max = dst_fmt->green_max;
-	uint32_t dst_blue_max = dst_fmt->blue_max;
-
 	uint32_t src_red_bits = POPCOUNT(src_fmt->red_max);
 	uint32_t src_green_bits = POPCOUNT(src_fmt->green_max);
 	uint32_t src_blue_bits = POPCOUNT(src_fmt->blue_max);
@@ -74,6 +70,31 @@ void pixel32_to_cpixel(uint8_t* restrict dst,
 	}
 
 	switch (bytes_per_cpixel) {
+	case 4:
+		if (dst_fmt->big_endian_flag) {
+			while (len--) {
+				uint32_t cpx, px = *src++;
+
+				CONVERT_PIXELS(cpx, px)
+
+				*dst++ = (cpx >> 24) & 0xff;
+				*dst++ = (cpx >> 16) & 0xff;
+				*dst++ = (cpx >> 8) & 0xff;
+				*dst++ = (cpx >> 0) & 0xff;
+			}
+		} else {
+			while (len--) {
+				uint32_t cpx, px = *src++;
+
+				CONVERT_PIXELS(cpx, px)
+
+				*dst++ = (cpx >> 0) & 0xff;
+				*dst++ = (cpx >> 8) & 0xff;
+				*dst++ = (cpx >> 16) & 0xff;
+				*dst++ = (cpx >> 24) & 0xff;
+			}
+		}
+		break;
 	case 3:
 		if (dst_fmt->bits_per_pixel == 32 && dst_fmt->depth <= 24) {
 			uint32_t min_dst_shift = dst_red_shift;
@@ -87,8 +108,6 @@ void pixel32_to_cpixel(uint8_t* restrict dst,
 			dst_blue_shift -= min_dst_shift;
 		}
 
-		/* fallthrough */
-	case 4:
 		dst_endian_correction = dst_fmt->big_endian_flag ? 16 : 0;
 
 		while (len--) {