From a53f83f023d3a4a166cc1107cb16aa5f0cc0f2c9 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@gmail.com>
Date: Tue, 23 Apr 2024 13:13:19 -0500
Subject: [PATCH] use mode enums in _imagingft.c

---
 src/_imagingft.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/_imagingft.c b/src/_imagingft.c
index 29d8e9e71..a38ea507a 100644
--- a/src/_imagingft.c
+++ b/src/_imagingft.c
@@ -525,7 +525,7 @@ font_getlength(FontObject *self, PyObject *args) {
     int horizontal_dir;           /* is primary axis horizontal? */
     int mask = 0;                 /* is FT_LOAD_TARGET_MONO enabled? */
     int color = 0;                /* is FT_LOAD_COLOR enabled? */
-    const char *mode = NULL;
+    const char *mode_name = NULL;
     const char *dir = NULL;
     const char *lang = NULL;
     PyObject *features = Py_None;
@@ -534,15 +534,16 @@ font_getlength(FontObject *self, PyObject *args) {
     /* calculate size and bearing for a given string */
 
     if (!PyArg_ParseTuple(
-            args, "O|zzOz:getlength", &string, &mode, &dir, &features, &lang
+            args, "O|zzOz:getlength", &string, &mode_name, &dir, &features, &lang
         )) {
         return NULL;
     }
 
     horizontal_dir = dir && strcmp(dir, "ttb") == 0 ? 0 : 1;
 
-    mask = mode && strcmp(mode, "1") == 0;
-    color = mode && strcmp(mode, "RGBA") == 0;
+    const ModeID mode = findModeID(mode_name);
+    mask = mode == IMAGING_MODE_1;
+    color = mode == IMAGING_MODE_RGBA;
 
     count = text_layout(string, self, dir, features, lang, &glyph_info, mask, color);
     if (PyErr_Occurred()) {
@@ -754,7 +755,7 @@ font_getsize(FontObject *self, PyObject *args) {
     int horizontal_dir;           /* is primary axis horizontal? */
     int mask = 0;                 /* is FT_LOAD_TARGET_MONO enabled? */
     int color = 0;                /* is FT_LOAD_COLOR enabled? */
-    const char *mode = NULL;
+    const char *mode_name = NULL;
     const char *dir = NULL;
     const char *lang = NULL;
     const char *anchor = NULL;
@@ -764,15 +765,23 @@ font_getsize(FontObject *self, PyObject *args) {
     /* calculate size and bearing for a given string */
 
     if (!PyArg_ParseTuple(
-            args, "O|zzOzz:getsize", &string, &mode, &dir, &features, &lang, &anchor
+            args,
+            "O|zzOzz:getsize",
+            &string,
+            &mode_name,
+            &dir,
+            &features,
+            &lang,
+            &anchor
         )) {
         return NULL;
     }
 
     horizontal_dir = dir && strcmp(dir, "ttb") == 0 ? 0 : 1;
 
-    mask = mode && strcmp(mode, "1") == 0;
-    color = mode && strcmp(mode, "RGBA") == 0;
+    const ModeID mode = findModeID(mode_name);
+    mask = mode == IMAGING_MODE_1;
+    color = mode == IMAGING_MODE_RGBA;
 
     count = text_layout(string, self, dir, features, lang, &glyph_info, mask, color);
     if (PyErr_Occurred()) {
@@ -839,7 +848,7 @@ font_render(FontObject *self, PyObject *args) {
     int stroke_filled = 0;
     PY_LONG_LONG foreground_ink_long = 0;
     unsigned int foreground_ink;
-    const char *mode = NULL;
+    const char *mode_name = NULL;
     const char *dir = NULL;
     const char *lang = NULL;
     const char *anchor = NULL;
@@ -859,7 +868,7 @@ font_render(FontObject *self, PyObject *args) {
             "OO|zzOzfpzL(ff):render",
             &string,
             &fill,
-            &mode,
+            &mode_name,
             &dir,
             &features,
             &lang,
@@ -873,8 +882,9 @@ font_render(FontObject *self, PyObject *args) {
         return NULL;
     }
 
-    mask = mode && strcmp(mode, "1") == 0;
-    color = mode && strcmp(mode, "RGBA") == 0;
+    const ModeID mode = findModeID(mode_name);
+    mask = mode == IMAGING_MODE_1;
+    color = mode == IMAGING_MODE_RGBA;
 
     foreground_ink = foreground_ink_long;