diff --git a/src/libImaging/JpegDecode.c b/src/libImaging/JpegDecode.c
index 2970f56d1..36eb7835a 100644
--- a/src/libImaging/JpegDecode.c
+++ b/src/libImaging/JpegDecode.c
@@ -196,22 +196,22 @@ ImagingJpegDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t by
 
             /* rawmode indicates what we want from the decoder.  if not
                set, conversions are disabled */
-            if (strcmp(context->rawmode, "L") == 0) {
+            if (context->rawmode == IMAGING_RAWMODE_L) {
                 context->cinfo.out_color_space = JCS_GRAYSCALE;
-            } else if (strcmp(context->rawmode, "RGB") == 0) {
+            } else if (context->rawmode == IMAGING_RAWMODE_RGB) {
                 context->cinfo.out_color_space = JCS_RGB;
             }
 #ifdef JCS_EXTENSIONS
-            else if (strcmp(context->rawmode, "RGBX") == 0) {
+            else if (context->rawmode == IMAGING_RAWMODE_RGBX) {
                 context->cinfo.out_color_space = JCS_EXT_RGBX;
             }
 #endif
-            else if (strcmp(context->rawmode, "CMYK") == 0 ||
-                     strcmp(context->rawmode, "CMYK;I") == 0) {
+            else if (context->rawmode == IMAGING_RAWMODE_CMYK ||
+                     context->rawmode == IMAGING_RAWMODE_CMYK_I) {
                 context->cinfo.out_color_space = JCS_CMYK;
-            } else if (strcmp(context->rawmode, "YCbCr") == 0) {
+            } else if (context->rawmode == IMAGING_RAWMODE_YCbCr) {
                 context->cinfo.out_color_space = JCS_YCbCr;
-            } else if (strcmp(context->rawmode, "YCbCrK") == 0) {
+            } else if (context->rawmode == IMAGING_RAWMODE_YCbCrK) {
                 context->cinfo.out_color_space = JCS_YCCK;
             } else {
                 /* Disable decoder conversions */
diff --git a/src/libImaging/Mode.h b/src/libImaging/Mode.h
index bd184808d..36deddd02 100644
--- a/src/libImaging/Mode.h
+++ b/src/libImaging/Mode.h
@@ -79,7 +79,9 @@ extern const RawMode * const IMAGING_RAWMODE_I_32B;
 
 // Rawmodes
 extern const RawMode * const IMAGING_RAWMODE_1_R;
+extern const RawMode * const IMAGING_RAWMODE_CMYK_I;
 extern const RawMode * const IMAGING_RAWMODE_YCC_P;
+extern const RawMode * const IMAGING_RAWMODE_YCbCrK;
 
 const RawMode * findRawMode(const char * const name);