From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 18 Oct 2022 12:12:13 +0000 (+0200)
Subject: scheduler/printers.c: Check for CMYK as well (fixes #421)
X-Git-Tag: v2.4.3~90^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F500%2Fhead;p=thirdparty%2Fcups.git

scheduler/printers.c: Check for CMYK as well (fixes #421)

In `load_ppd()` we would set the `print-color-mode` to `monochrome` only if
the device supported color printing and the default PPD choice for
ColorModel was RGB - this broke settings for color printing for models,
which use `CMYK` for ColorModel.

With this patch we check for CMYK as well.

CUPS 3.0-
---

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 3ca91fd455..757f265cea 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -4547,7 +4547,7 @@ load_ppd(cupsd_printer_t *p)		/* I - Printer */
         ppd_option_t *color_model = ppdFindOption(ppd, "ColorModel");
 					// ColorModel PPD option
 
-        if (color_model && strcmp(color_model->defchoice, "RGB"))
+        if (color_model && strcmp(color_model->defchoice, "RGB") && strcmp(color_model->defchoice, "CMYK"))
           p->num_options = cupsAddOption("print-color-mode", "monochrome", p->num_options, &p->options);
       }
     }