From: DRC <information@libjpeg-turbo.org>
Date: Tue, 13 Mar 2018 15:54:57 +0000 (-0500)
Subject: Fix build when RGB_{RED,GREEN,BLUE}!={0,1,2}
X-Git-Tag: 1.5.90~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4508ab3e51656ec30cd1ba12db105d888d09f896;p=libjpeg-turbo

Fix build when RGB_{RED,GREEN,BLUE}!={0,1,2}

Broken by aa7459050d7a50e1d8a99488902d41fbc118a50f
---

diff --git a/rdppm.c b/rdppm.c
index b7cd425..7bb20c0 100644
--- a/rdppm.c
+++ b/rdppm.c
@@ -660,8 +660,9 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
     } else if (maxval == MAXJSAMPLE && sizeof(JSAMPLE) == sizeof(U_CHAR) &&
                (cinfo->in_color_space == JCS_EXT_RGB
 #if RGB_RED == 0 && RGB_GREEN == 1 && RGB_BLUE == 2 && RGB_PIXELSIZE == 3
-                || cinfo->in_color_space == JCS_RGB)) {
+                || cinfo->in_color_space == JCS_RGB
 #endif
+               )) {
       source->pub.get_pixel_rows = get_raw_row;
       use_raw_buffer = TRUE;
       need_rescale = FALSE;