From 329159bddccd9bcd5fec929a0b0e4435b85bf15e Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sun, 2 Apr 2023 23:23:54 -0700
Subject: [PATCH] Util: Refactor some things that will be used later

---
 src/util/image.c | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/util/image.c b/src/util/image.c
index 26cbaf01e..106fbef08 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -13,6 +13,34 @@
 
 #define ROW(IM, Y) PIXEL(IM, 0, Y)
 
+#ifdef __BIG_ENDIAN__
+#define SHIFT_IN(COLOR, DEPTH) \
+	if ((DEPTH) < 4) { \
+		(COLOR) >>= (32 - 8 * (DEPTH)); \
+	}
+
+#define SHIFT_OUT(COLOR, DEPTH) \
+	if ((DEPTH) < 4) { \
+		(COLOR) <<= (32 - 8 *(DEPTH)); \
+	}
+#else
+#define SHIFT_IN(COLOR, DEPTH)
+#define SHIFT_OUT(COLOR, DEPTH)
+#endif
+
+#define GET_PIXEL(DST, SRC, DEPTH) do { \
+	uint32_t _color = 0; \
+	memcpy(&_color, (void*) (SRC), (DEPTH)); \
+	SHIFT_IN(_color, (DEPTH)); \
+	(DST) = _color; \
+} while (0)
+
+#define PUT_PIXEL(SRC, DST, DEPTH) do { \
+	uint32_t _color = (SRC); \
+	SHIFT_OUT(_color, (DEPTH)); \
+	memcpy((void*) (DST), &_color, (DEPTH)); \
+} while (0);
+
 struct mImage* mImageCreate(unsigned width, unsigned height, enum mColorFormat format) {
 	return mImageCreateWithStride(width, height, width, format);
 }
@@ -147,20 +175,10 @@ struct mImage* mImageConvertToFormat(const struct mImage* image, enum mColorForm
 		uintptr_t src = (uintptr_t) ROW(image, y);
 		uintptr_t dst = (uintptr_t) ROW(newImage, y);
 		for (x = 0; x < newImage->width; ++x, src += image->depth, dst += newImage->depth) {
-			uint32_t color = 0;
-			memcpy(&color, (void*) src, image->depth);
-#ifdef __BIG_ENDIAN__
-			if (image->depth < 4) {
-				color >>= (32 - 8 * image->depth);
-			}
-#endif
+			uint32_t color;
+			GET_PIXEL(color, src, image->depth);
 			color = mColorConvert(color, image->format, format);
-#ifdef __BIG_ENDIAN__
-			if (newImage->depth < 4) {
-				color <<= (32 - 8 * newImage->depth);
-			}
-#endif
-			memcpy((void*) dst, &color, newImage->depth);
+			PUT_PIXEL(color, dst, newImage->depth);
 		}
 	}
 	return newImage;