From adfb66f1d6b61494f0c111ffb21a38dbfc720b4c Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Sun, 20 Jul 2025 10:18:59 +0200
Subject: [PATCH] Fix Compliation errors from rebase

---
 src/_imaging.c                | 5 ++++-
 src/libImaging/BcnEncode.c    | 2 +-
 src/libImaging/Convert.c      | 3 ---
 src/libImaging/Jpeg2KEncode.c | 2 +-
 src/libImaging/Pack.c         | 4 +---
 src/libImaging/Unpack.c       | 8 +++-----
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/_imaging.c b/src/_imaging.c
index 4264cdb87..7823745f0 100644
--- a/src/_imaging.c
+++ b/src/_imaging.c
@@ -297,6 +297,7 @@ ExportArrowArrayPyCapsule(ImagingObject *self) {
 static PyObject *
 _new_arrow(PyObject *self, PyObject *args) {
     char *mode;
+    ModeID mode_id;
     int xsize, ysize;
     PyObject *schema_capsule, *array_capsule;
     PyObject *ret;
@@ -307,9 +308,11 @@ _new_arrow(PyObject *self, PyObject *args) {
         return NULL;
     }
 
+    mode_id = findModeID(mode);
+
     // ImagingBorrowArrow is responsible for retaining the array_capsule
     ret = PyImagingNew(
-        ImagingNewArrow(mode, xsize, ysize, schema_capsule, array_capsule)
+        ImagingNewArrow(mode_id, xsize, ysize, schema_capsule, array_capsule)
     );
     if (!ret) {
         return ImagingError_ValueError("Invalid Arrow array mode or size mismatch");
diff --git a/src/libImaging/BcnEncode.c b/src/libImaging/BcnEncode.c
index 7a5072dde..2101383fd 100644
--- a/src/libImaging/BcnEncode.c
+++ b/src/libImaging/BcnEncode.c
@@ -253,7 +253,7 @@ int
 ImagingBcnEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
     int n = state->state;
     int has_alpha_channel =
-        strcmp(im->mode, "RGBA") == 0 || strcmp(im->mode, "LA") == 0;
+        im->mode == IMAGING_MODE_RGBA || im->mode == IMAGING_MODE_LA;
 
     UINT8 *dst = buf;
 
diff --git a/src/libImaging/Convert.c b/src/libImaging/Convert.c
index 0c36b8449..330e5325c 100644
--- a/src/libImaging/Convert.c
+++ b/src/libImaging/Convert.c
@@ -1517,9 +1517,6 @@ static struct {
     {IMAGING_MODE_RGB, IMAGING_MODE_I_16N, rgb2i16l},
 #endif
     {IMAGING_MODE_RGB, IMAGING_MODE_F, rgb2f},
-    {IMAGING_MODE_RGB, IMAGING_MODE_BGR_15, rgb2bgr15},
-    {IMAGING_MODE_RGB, IMAGING_MODE_BGR_16, rgb2bgr16},
-    {IMAGING_MODE_RGB, IMAGING_MODE_BGR_24, rgb2bgr24},
     {IMAGING_MODE_RGB, IMAGING_MODE_RGBA, rgb2rgba},
     {IMAGING_MODE_RGB, IMAGING_MODE_RGBa, rgb2rgba},
     {IMAGING_MODE_RGB, IMAGING_MODE_RGBX, rgb2rgba},
diff --git a/src/libImaging/Jpeg2KEncode.c b/src/libImaging/Jpeg2KEncode.c
index 67290f674..fdfbde2d7 100644
--- a/src/libImaging/Jpeg2KEncode.c
+++ b/src/libImaging/Jpeg2KEncode.c
@@ -332,7 +332,7 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
         pack = j2k_pack_rgba;
 #if ((OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR == 5 && OPJ_VERSION_BUILD >= 3) || \
      (OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR > 5) || OPJ_VERSION_MAJOR > 2)
-    } else if (strcmp(im->mode, "CMYK") == 0) {
+    } else if (im->mode == IMAGING_MODE_CMYK) {
         components = 4;
         color_space = OPJ_CLRSPC_CMYK;
         pack = j2k_pack_rgba;
diff --git a/src/libImaging/Pack.c b/src/libImaging/Pack.c
index a0652e0ca..0a97c4872 100644
--- a/src/libImaging/Pack.c
+++ b/src/libImaging/Pack.c
@@ -651,9 +651,7 @@ static struct {
     {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16N, 16, packI16N_I16
     },  // LibTiff native->image endian.
     {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16N, 16, packI16N_I16},
-    {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16N, 16, packI16N_I16B},
-
-    {NULL} /* sentinel */
+    {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16N, 16, packI16N_I16B}
 };
 
 ImagingShuffler
diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c
index 8d4bb8619..075ec5b95 100644
--- a/src/libImaging/Unpack.c
+++ b/src/libImaging/Unpack.c
@@ -1313,7 +1313,7 @@ copy4skip2(UINT8 *_out, const UINT8 *in, int pixels) {
 /* Unpack to "I" and "F" images */
 
 #define UNPACK_RAW(NAME, GET, INTYPE, OUTTYPE)                   \
-    static void NAME(UINT8 *out, const UINT8 *in, int pixels) { \
+    static void NAME(UINT8 *out_, const UINT8 *in, int pixels) { \
         int i;                                                   \
         OUTTYPE *out = (OUTTYPE *)out_;                          \
         for (i = 0; i < pixels; i++, in += sizeof(INTYPE)) {     \
@@ -1322,7 +1322,7 @@ copy4skip2(UINT8 *_out, const UINT8 *in, int pixels) {
     }
 
 #define UNPACK(NAME, COPY, INTYPE, OUTTYPE)                      \
-    static void NAME(UINT8 *out, const UINT8 *in, int pixels) { \
+    static void NAME(UINT8 *out_, const UINT8 *in, int pixels) { \
         int i;                                                   \
         OUTTYPE *out = (OUTTYPE *)out_;                          \
         INTYPE tmp_;                                             \
@@ -1839,9 +1839,7 @@ static struct {
 
     {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16R, 16, unpackI16R_I16},
 
-    {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_12, 12, unpackI12_I16},  // 12 bit Tiffs stored in 16bits.
-
-    {NULL} /* sentinel */
+    {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_12, 12, unpackI12_I16}  // 12 bit Tiffs stored in 16bits.
 };
 
 ImagingShuffler