From 97cea285a17c994bc16a60da0a1f2fd5b491b72c Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 25 Apr 2024 00:17:16 +1000
Subject: [PATCH] Combined conditions

---
 src/_imagingcms.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/_imagingcms.c b/src/_imagingcms.c
index f18d55a5718..f6b30f93593 100644
--- a/src/_imagingcms.c
+++ b/src/_imagingcms.c
@@ -213,32 +213,31 @@ cms_transform_dealloc(CmsTransformObject *self) {
 
 static cmsUInt32Number
 findLCMStype(char *PILmode) {
-    if (strcmp(PILmode, "RGB") == 0) {
-        return TYPE_RGBA_8;
-    } else if (strcmp(PILmode, "RGBA") == 0) {
-        return TYPE_RGBA_8;
-    } else if (strcmp(PILmode, "RGBX") == 0) {
+    if (
+        strcmp(PILmode, "RGB") == 0 ||
+        strcmp(PILmode, "RGBA") == 0 ||
+        strcmp(PILmode, "RGBX") == 0
+    ) {
         return TYPE_RGBA_8;
     } else if (strcmp(PILmode, "RGBA;16B") == 0) {
         return TYPE_RGBA_16;
     } else if (strcmp(PILmode, "CMYK") == 0) {
         return TYPE_CMYK_8;
-    } else if (strcmp(PILmode, "L") == 0) {
-        return TYPE_GRAY_8;
     } else if (strcmp(PILmode, "L;16") == 0) {
         return TYPE_GRAY_16;
     } else if (strcmp(PILmode, "L;16B") == 0) {
         return TYPE_GRAY_16_SE;
-    } else if (strcmp(PILmode, "YCCA") == 0) {
-        return TYPE_YCbCr_8;
-    } else if (strcmp(PILmode, "YCC") == 0) {
+    } else if (
+        strcmp(PILmode, "YCCA") == 0 ||
+        strcmp(PILmode, "YCC") == 0
+    ) {
         return TYPE_YCbCr_8;
     } else if (strcmp(PILmode, "LAB") == 0) {
         // LabX equivalent like ALab, but not reversed -- no #define in lcms2
         return (COLORSPACE_SH(PT_LabV2) | CHANNELS_SH(3) | BYTES_SH(1) | EXTRA_SH(1));
     }
     else {
-        /* take a wild guess... */
+        /* presume "L" by default */
         return TYPE_GRAY_8;
     }
 }