From 3f786819c8639196724e42dd1233c5d6fd4d1537 Mon Sep 17 00:00:00 2001 From: msweet Date: Wed, 10 Jul 2013 14:35:53 +0000 Subject: [PATCH] Printer xxx-default values were not reported by Get-Printer-Attributes or lpoptions () git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11115 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES-1.6.txt | 2 ++ cups/encode.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt index 896badedd..ef6db8d28 100644 --- a/CHANGES-1.6.txt +++ b/CHANGES-1.6.txt @@ -5,6 +5,8 @@ CHANGES IN CUPS V1.6.3 - The configure script now prefers Clang over GCC. - Fixed a compile problem on AIX (STR #4307) + - Printer xxx-default values were not reported by Get-Printer-Attributes + or lpoptions () - The default IPP version did not always get set before creating a new IPP request message () - The lp, lpq, lpr, and lpstat now display an error message advising the diff --git a/cups/encode.c b/cups/encode.c index 62516a01d..667e0d304 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -534,7 +534,7 @@ cupsEncodeOptions2( else ops ++; - if (*ops == IPP_OP_CUPS_NONE) + if (*ops == IPP_OP_CUPS_NONE && op != IPP_OP_CUPS_NONE) { DEBUG_printf(("2cupsEncodeOptions2: Skipping \"%s\".", option->name)); continue; -- 2.39.2