From 5e7464ec5e54fc17673eed97b9b36fdf716d76a1 Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 1 Jun 2015 18:45:56 +0000
Subject: [PATCH] Don't write empty ColorModel option (STR #4638)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12685 a1ca3aef-8c08-0410-bb20-df032aa958be
---
 cups/ppd-cache.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 96f7db0c9c..e8d9cc3770 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -3181,8 +3181,6 @@ _ppdCreateFromIPP(char   *buffer,	/* I - Filename buffer */
   {
     const char *default_color = NULL;	/* Default */
 
-    cupsFilePuts(fp, "*OpenUI *ColorModel/Color Mode: PickOne\n"
-		     "*OrderDependency: 10 AnySetup *ColorModel\n");
     for (i = 0, count = ippGetCount(attr); i < count; i ++)
     {
       const char *keyword = ippGetString(attr, i, NULL);
@@ -3190,6 +3188,10 @@ _ppdCreateFromIPP(char   *buffer,	/* I - Filename buffer */
 
       if (!strcmp(keyword, "black_1") || !strcmp(keyword, "bi-level") || !strcmp(keyword, "process-bi-level"))
       {
+        if (!default_color)
+	  cupsFilePuts(fp, "*OpenUI *ColorModel/Color Mode: PickOne\n"
+		           "*OrderDependency: 10 AnySetup *ColorModel\n");
+
         cupsFilePuts(fp, "*ColorModel FastGray/Fast Grayscale: \"<</cupsColorSpace 3/cupsBitsPerColor 1/cupsColorOrder 0/cupsCompression 0>>setpagedevice\"\n");
 
         if (!default_color)
@@ -3197,6 +3199,10 @@ _ppdCreateFromIPP(char   *buffer,	/* I - Filename buffer */
       }
       else if (!strcmp(keyword, "sgray_8") || !strcmp(keyword, "monochrome") || !strcmp(keyword, "process-monochrome"))
       {
+        if (!default_color)
+	  cupsFilePuts(fp, "*OpenUI *ColorModel/Color Mode: PickOne\n"
+		           "*OrderDependency: 10 AnySetup *ColorModel\n");
+
         cupsFilePuts(fp, "*ColorModel Gray/Grayscale: \"<</cupsColorSpace 18/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0>>setpagedevice\"\n");
 
         if (!default_color || !strcmp(default_color, "FastGray"))
@@ -3204,6 +3210,10 @@ _ppdCreateFromIPP(char   *buffer,	/* I - Filename buffer */
       }
       else if (!strcmp(keyword, "srgb_8") || !strcmp(keyword, "color"))
       {
+        if (!default_color)
+	  cupsFilePuts(fp, "*OpenUI *ColorModel/Color Mode: PickOne\n"
+		           "*OrderDependency: 10 AnySetup *ColorModel\n");
+
         cupsFilePuts(fp, "*ColorModel RGB/Color: \"<</cupsColorSpace 19/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0>>setpagedevice\"\n");
 
 	default_color = "RGB";
@@ -3211,9 +3221,10 @@ _ppdCreateFromIPP(char   *buffer,	/* I - Filename buffer */
     }
 
     if (default_color)
+    {
       cupsFilePrintf(fp, "*DefaultColorModel: %s\n", default_color);
-
-    cupsFilePuts(fp, "*CloseUI: *ColorModel\n");
+      cupsFilePuts(fp, "*CloseUI: *ColorModel\n");
+    }
   }
 
  /*
-- 
2.47.2