libcupsfilters: Small fixes on previous commit.

tillkamppeter · tillkamppeter · commit 1557119feaa2 · 2022-01-15T21:47:02.000-03:00
diff --git a/cupsfilters/ppdgenerator.c b/cupsfilters/ppdgenerator.c
@@ -2650,7 +2650,7 @@ cfCreatePPDFromIPP2(char         *buffer,          /* I - Filename buffer */
         cupsFilePrintf(fp, "*ColorModel RGB/%s: \"\"\n",
 		       (human_readable2 ? human_readable2 : "Color"));
 
-        if (!default_color)
+        if (!defattr)
 	  default_color = "RGB";
 
 	/* Apparently some printers only advertise color support, so make sure
@@ -2669,7 +2669,7 @@ cfCreatePPDFromIPP2(char         *buffer,          /* I - Filename buffer */
       }
     }
 
-    if (default_pagesize != NULL) {
+    if (default_pagesize != NULL && (!default_color || !defattr)) {
       /* Here we are dealing with a cluster, if the default cluster color
          is not supplied we set it Gray*/
       if (default_cluster_color != NULL) {

Original file line number	Diff line number	Diff line change
`@@ -2650,7 +2650,7 @@ cfCreatePPDFromIPP2(char buffer, / I - Filename buffer */`
`2650`	`2650`	`cupsFilePrintf(fp, "*ColorModel RGB/%s: \"\"\n",`
`2651`	`2651`	`(human_readable2 ? human_readable2 : "Color"));`
`2652`	`2652`
`2653`		`- if (!default_color)`
	`2653`	`+ if (!defattr)`
`2654`	`2654`	`default_color = "RGB";`
`2655`	`2655`
`2656`	`2656`	`/* Apparently some printers only advertise color support, so make sure`
`@@ -2669,7 +2669,7 @@ cfCreatePPDFromIPP2(char buffer, / I - Filename buffer */`
`2669`	`2669`	`}`
`2670`	`2670`	`}`
`2671`	`2671`
`2672`		`- if (default_pagesize != NULL) {`
	`2672`	`+ if (default_pagesize != NULL && (!default_color \|\| !defattr)) {`
`2673`	`2673`	`/* Here we are dealing with a cluster, if the default cluster color`
`2674`	`2674`	`is not supplied we set it Gray*/`
`2675`	`2675`	`if (default_cluster_color != NULL) {`