diff --git a/CHANGES.md b/CHANGES.md index 22f8e25032..54ca86aa60 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -CHANGES - 2.2.9 - 2018-07-17 +CHANGES - 2.2.9 - 2018-07-18 ============================ @@ -14,6 +14,7 @@ Changes in CUPS v2.2.9 - Fixed a crash bug in the Epson dot matrix driver (Issue #5323) - Automatic debug logging of job errors did not work with systemd (Issue #5337) - The web interface did not list the IPP Everywhere "driver" (Issue #5338) +- Fixed some typos in the label printer drivers (Issue #5350) - The scheduler was being backgrounded on macOS, causing applications to spin (rdar://40436080) - Authentication in the web interface did not work on macOS (rdar://41444473) diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c index 4e491811b9..6ad6c625af 100644 --- a/filter/rastertolabel.c +++ b/filter/rastertolabel.c @@ -305,7 +305,7 @@ StartPage(ppd_file_t *ppd, /* I - PPD file */ header->HWResolution[1], header->cupsHeight, header->NumCopies); printf("PAGE-WIDTH %u\r\n", header->cupsWidth); - printf("PAGE-HEIGHT %u\r\n", header->cupsWidth); + printf("PAGE-HEIGHT %u\r\n", header->cupsHeight); break; case INTELLITECH_PCL : @@ -374,7 +374,7 @@ StartPage(ppd_file_t *ppd, /* I - PPD file */ if (header->cupsCompression != ~0U) /* inPrintDensity */ - printf("\033&d%uA", 30 * header->cupsCompression / 100 - 15); + printf("\033&d%dA", 30 * header->cupsCompression / 100 - 15); if ((choice = ppdFindMarkedChoice(ppd, "inPrintMode")) != NULL) { diff --git a/ppdc/sample.drv b/ppdc/sample.drv index 58c6475d84..ec86338fbf 100644 --- a/ppdc/sample.drv +++ b/ppdc/sample.drv @@ -458,35 +458,35 @@ Version "2.1" Option "inPrintDensity/Print Density" PickOne DocumentSetup 20.0 *Choice "Default/Printer Default" "<>setpagedevice" Choice "-15/-15" "<>setpagedevice" - Choice "-14/-14" "<>setpagedevice" - Choice "-13/-13" "<>setpagedevice" + Choice "-14/-14" "<>setpagedevice" + Choice "-13/-13" "<>setpagedevice" Choice "-12/-12" "<>setpagedevice" - Choice "-11/-11" "<>setpagedevice" - Choice "-10/-10" "<>setpagedevice" + Choice "-11/-11" "<>setpagedevice" + Choice "-10/-10" "<>setpagedevice" Choice "-9/-9" "<>setpagedevice" - Choice "-8/-8" "<>setpagedevice" - Choice "-7/-7" "<>setpagedevice" + Choice "-8/-8" "<>setpagedevice" + Choice "-7/-7" "<>setpagedevice" Choice "-6/-6" "<>setpagedevice" - Choice "-5/-5" "<>setpagedevice" - Choice "-4/-4" "<>setpagedevice" + Choice "-5/-5" "<>setpagedevice" + Choice "-4/-4" "<>setpagedevice" Choice "-3/-3" "<>setpagedevice" - Choice "-2/-2" "<>setpagedevice" - Choice "-1/-1" "<>setpagedevice" + Choice "-2/-2" "<>setpagedevice" + Choice "-1/-1" "<>setpagedevice" Choice "0/0" "<>setpagedevice" - Choice "1/1" "<>setpagedevice" - Choice "2/2" "<>setpagedevice" + Choice "1/1" "<>setpagedevice" + Choice "2/2" "<>setpagedevice" Choice "3/3" "<>setpagedevice" - Choice "4/4" "<>setpagedevice" - Choice "5/5" "<>setpagedevice" + Choice "4/4" "<>setpagedevice" + Choice "5/5" "<>setpagedevice" Choice "6/6" "<>setpagedevice" - Choice "7/7" "<>setpagedevice" - Choice "8/8" "<>setpagedevice" + Choice "7/7" "<>setpagedevice" + Choice "8/8" "<>setpagedevice" Choice "9/9" "<>setpagedevice" - Choice "10/10" "<>setpagedevice" - Choice "11/11" "<>setpagedevice" + Choice "10/10" "<>setpagedevice" + Choice "11/11" "<>setpagedevice" Choice "12/12" "<>setpagedevice" - Choice "13/13" "<>setpagedevice" - Choice "14/14" "<>setpagedevice" + Choice "13/13" "<>setpagedevice" + Choice "14/14" "<>setpagedevice" Choice "15/15" "<>setpagedevice" Option "inPrintRate/Print Speed" PickOne DocumentSetup 20.0 *Choice "Default/Printer Default" "<>setpagedevice"