diff options
author | 2020-03-19 13:53:45 +0100 | |
---|---|---|
committer | 2020-08-13 11:28:25 +0200 | |
commit | dc2ba49207af71193f1390d84bba4e15aeea0ce0 (patch) | |
tree | 79c2a51cb5fa2b87800b1113e0015a7108cd2eb3 /cups | |
parent | Import Ghostscript 9.50 (diff) | |
download | ghostscript-gpl-patches-dc2ba49207af71193f1390d84bba4e15aeea0ce0.tar.gz ghostscript-gpl-patches-dc2ba49207af71193f1390d84bba4e15aeea0ce0.tar.bz2 ghostscript-gpl-patches-dc2ba49207af71193f1390d84bba4e15aeea0ce0.zip |
Import Ghostscript 9.52ghostscript-9.52
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'cups')
-rw-r--r-- | cups/gdevcups.c | 6 | ||||
-rw-r--r-- | cups/libs/filter/cupsraster.c (renamed from cups/libs/filter/raster.c) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cups/gdevcups.c b/cups/gdevcups.c index 3df3f039..8fa48860 100644 --- a/cups/gdevcups.c +++ b/cups/gdevcups.c @@ -2860,7 +2860,7 @@ cups_open(gx_device *pdev) /* I - Device info */ cups->PPD = ppdOpenFile(getenv("PPD")); if (cups->pageSizeRequested[0] == '\0') { - strncpy(cups->pageSizeRequested, cups->header.cupsPageSizeName, 64); + (void) snprintf(cups->pageSizeRequested, sizeof(cups->pageSizeRequested), "%s", cups->header.cupsPageSizeName); #ifdef CUPS_DEBUG dmprintf1(pdev->memory, "DEBUG: Page size requested: %s\n", cups->header.cupsPageSizeName); @@ -4443,6 +4443,8 @@ cups_set_color_info(gx_device *pdev) /* I - Device info */ case CUPS_CSPACE_SW : case CUPS_CSPACE_WHITE : case CUPS_CSPACE_RGB : + case CUPS_CSPACE_CMY: + case CUPS_CSPACE_YMC: case CUPS_CSPACE_SRGB : case CUPS_CSPACE_ADOBERGB : case CUPS_CSPACE_RGBA : @@ -4471,8 +4473,6 @@ cups_set_color_info(gx_device *pdev) /* I - Device info */ case CUPS_CSPACE_K : case CUPS_CSPACE_GOLD : case CUPS_CSPACE_SILVER : - case CUPS_CSPACE_CMY : - case CUPS_CSPACE_YMC : case CUPS_CSPACE_KCMYcm : case CUPS_CSPACE_CMYK : case CUPS_CSPACE_YMCK : diff --git a/cups/libs/filter/raster.c b/cups/libs/filter/cupsraster.c index 8dd76abe..8dd76abe 100644 --- a/cups/libs/filter/raster.c +++ b/cups/libs/filter/cupsraster.c |