diff options
| author | Didier Raboud <odyx@debian.org> | 2019-06-08 08:50:55 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2019-06-08 08:50:55 +0200 |
| commit | f898bd47af3228196fc4b41f6d276a44be5a4048 (patch) | |
| tree | b9e42c675a3f6fa51c113d08b20d486d6a76b0e8 /cupsfilters | |
| parent | 40112f408f1faac0e4aef355a2277a5a0de2c1a8 (diff) | |
New upstream version 1.25.0
Diffstat (limited to 'cupsfilters')
| -rw-r--r-- | cupsfilters/ppdgenerator.c | 5 | ||||
| -rw-r--r-- | cupsfilters/raster.c | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/cupsfilters/ppdgenerator.c b/cupsfilters/ppdgenerator.c index 3c0feb7e6..7aa47c7c1 100644 --- a/cupsfilters/ppdgenerator.c +++ b/cupsfilters/ppdgenerator.c @@ -1,8 +1,9 @@ /* * PWG Raster/Apple Raster/PCLm/PDF/IPP legacy PPD generator * - * Copyright 2016 by Till Kamppeter. - * Copyright 2017 by Sahil Arora. + * Copyright 2016-2019 by Till Kamppeter. + * Copyright 2017-2019 by Sahil Arora. + * Copyright 2018-2019 by Deepak Patankar. * * The PPD generator is based on the PPD generator for the CUPS * "lpadmin -m everywhere" functionality in the cups/ppd-cache.c diff --git a/cupsfilters/raster.c b/cupsfilters/raster.c index 2670a0cf6..73fa868e8 100644 --- a/cupsfilters/raster.c +++ b/cupsfilters/raster.c @@ -786,6 +786,13 @@ cupsRasterParseIPPOptions(cups_page_header2_t *h, /* I - Raster header */ colorspace = 6; numcolors = 4; } + else if (!strncasecmp(val, "Cmy", 3)) + { + if (*(val + 3) == '_' || *(val + 3) == '-') + ptr = val + 4; + colorspace = 4; + numcolors = 3; + } else if (!strncasecmp(val, "Device", 6)) { ptr = val + 6; @@ -815,6 +822,13 @@ cupsRasterParseIPPOptions(cups_page_header2_t *h, /* I - Raster header */ colorspace = 19; numcolors = 3; } + else if (!strncasecmp(val, "Rgbw", 4)) + { + if (*(val + 4) == '_' || *(val + 4) == '-') + ptr = val + 5; + colorspace = 17; + numcolors = 4; + } else if (!strncasecmp(val, "Rgb", 3)) { if (*(val + 3) == '_' || *(val + 3) == '-') |