Allow PWG Raster types to vary by case (non-conformant behavior for Issue #4998)

diff --git a/CHANGES.md b/CHANGES.md
index c1ea15a255e383e7dbeb22adf2f4ce1925151f9b..208bc00f22d4bb06959ca577d5573fa3c9760923 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ CHANGES IN CUPS V2.2.4
 - Added a new CUPS Programming Manual to replace the aging API documentation.
 - Added the cupsAddIntegerOption and cupsGetIntegerOption functions
   (Issue #4992)
+- IPP Everywhere improvements (Issue #4998)
 - Fixed the "cancel all jobs" function in the web interface for several
   languages (Issue #4999)
 

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index e712341056788fbc3af8528cfec632932c480566..7e40214da2062b75f19cca117f49e90a54bbf882 100644 (file)
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -3595,7 +3595,7 @@ _ppdCreateFromIPP(char   *buffer, /* I - Filename buffer */
       const char *keyword = ippGetString(attr, i, NULL);
                                        /* Keyword for color/bit depth */
 
-      if (!strcmp(keyword, "black_1") || !strcmp(keyword, "bi-level") || !strcmp(keyword, "process-bi-level"))
+      if (!strcasecmp(keyword, "black_1") || !strcmp(keyword, "bi-level") || !strcmp(keyword, "process-bi-level"))
       {
         if (!default_color)
          cupsFilePrintf(fp, "*OpenUI *ColorModel/%s: PickOne\n"
@@ -3606,7 +3606,7 @@ _ppdCreateFromIPP(char   *buffer, /* I - Filename buffer */
         if (!default_color)
          default_color = "FastGray";
       }
-      else if (!strcmp(keyword, "sgray_8") || !strcmp(keyword, "W8") || !strcmp(keyword, "monochrome") || !strcmp(keyword, "process-monochrome"))
+      else if (!strcasecmp(keyword, "sgray_8") || !strcmp(keyword, "W8") || !strcmp(keyword, "monochrome") || !strcmp(keyword, "process-monochrome"))
       {
         if (!default_color)
          cupsFilePrintf(fp, "*OpenUI *ColorModel/%s: PickOne\n"
@@ -3617,7 +3617,7 @@ _ppdCreateFromIPP(char   *buffer, /* I - Filename buffer */
         if (!default_color || !strcmp(default_color, "FastGray"))
          default_color = "Gray";
       }
-      else if (!strcmp(keyword, "srgb_8") || !strcmp(keyword, "SRGB24") || !strcmp(keyword, "color"))
+      else if (!strcasecmp(keyword, "srgb_8") || !strcmp(keyword, "SRGB24") || !strcmp(keyword, "color"))
       {
         if (!default_color)
          cupsFilePrintf(fp, "*OpenUI *ColorModel/%s: PickOne\n"
@@ -3627,7 +3627,7 @@ _ppdCreateFromIPP(char   *buffer, /* I - Filename buffer */
 
        default_color = "RGB";
       }
-      else if (!strcmp(keyword, "adobe-rgb_16") || !strcmp(keyword, "ADOBERGB48"))
+      else if (!strcasecmp(keyword, "adobe-rgb_16") || !strcmp(keyword, "ADOBERGB48"))
       {
         if (!default_color)
          cupsFilePrintf(fp, "*OpenUI *ColorModel/%s: PickOne\n"