Merge label driver changes (Issue #5350)

diff --git a/CHANGES.md b/CHANGES.md
index 22f8e250328b5b5831b7d2f1f867372dd68c4293..54ca86aa603acaf72a13045480010db766e153d8 100644 (file)
--- 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 4e491811b9be3a77946bc9c6f03a2c82b1b4386d..6ad6c625af87dcacd09cde11f9f4afb86fd3c103 100644 (file)
--- 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 58c6475d845d70a5386a7fde04de832e879aeff8..ec86338fbfb1a28fc65437f90a30d70cf42250be 100644 (file)
--- 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" "<</cupsCompression -1>>setpagedevice"
       Choice "-15/-15" "<</cupsCompression 0>>setpagedevice"
-      Choice "-14/-14" "<</cupsCompression 3>>setpagedevice"
-      Choice "-13/-13" "<</cupsCompression 6>>setpagedevice"
+      Choice "-14/-14" "<</cupsCompression 4>>setpagedevice"
+      Choice "-13/-13" "<</cupsCompression 7>>setpagedevice"
       Choice "-12/-12" "<</cupsCompression 10>>setpagedevice"
-      Choice "-11/-11" "<</cupsCompression 13>>setpagedevice"
-      Choice "-10/-10" "<</cupsCompression 16>>setpagedevice"
+      Choice "-11/-11" "<</cupsCompression 14>>setpagedevice"
+      Choice "-10/-10" "<</cupsCompression 17>>setpagedevice"
       Choice "-9/-9" "<</cupsCompression 20>>setpagedevice"
-      Choice "-8/-8" "<</cupsCompression 23>>setpagedevice"
-      Choice "-7/-7" "<</cupsCompression 26>>setpagedevice"
+      Choice "-8/-8" "<</cupsCompression 24>>setpagedevice"
+      Choice "-7/-7" "<</cupsCompression 27>>setpagedevice"
       Choice "-6/-6" "<</cupsCompression 30>>setpagedevice"
-      Choice "-5/-5" "<</cupsCompression 33>>setpagedevice"
-      Choice "-4/-4" "<</cupsCompression 36>>setpagedevice"
+      Choice "-5/-5" "<</cupsCompression 34>>setpagedevice"
+      Choice "-4/-4" "<</cupsCompression 37>>setpagedevice"
       Choice "-3/-3" "<</cupsCompression 40>>setpagedevice"
-      Choice "-2/-2" "<</cupsCompression 43>>setpagedevice"
-      Choice "-1/-1" "<</cupsCompression 46>>setpagedevice"
+      Choice "-2/-2" "<</cupsCompression 44>>setpagedevice"
+      Choice "-1/-1" "<</cupsCompression 47>>setpagedevice"
       Choice "0/0" "<</cupsCompression 50>>setpagedevice"
-      Choice "1/1" "<</cupsCompression 53>>setpagedevice"
-      Choice "2/2" "<</cupsCompression 56>>setpagedevice"
+      Choice "1/1" "<</cupsCompression 54>>setpagedevice"
+      Choice "2/2" "<</cupsCompression 57>>setpagedevice"
       Choice "3/3" "<</cupsCompression 60>>setpagedevice"
-      Choice "4/4" "<</cupsCompression 63>>setpagedevice"
-      Choice "5/5" "<</cupsCompression 66>>setpagedevice"
+      Choice "4/4" "<</cupsCompression 64>>setpagedevice"
+      Choice "5/5" "<</cupsCompression 67>>setpagedevice"
       Choice "6/6" "<</cupsCompression 70>>setpagedevice"
-      Choice "7/7" "<</cupsCompression 73>>setpagedevice"
-      Choice "8/8" "<</cupsCompression 76>>setpagedevice"
+      Choice "7/7" "<</cupsCompression 74>>setpagedevice"
+      Choice "8/8" "<</cupsCompression 77>>setpagedevice"
       Choice "9/9" "<</cupsCompression 80>>setpagedevice"
-      Choice "10/10" "<</cupsCompression 83>>setpagedevice"
-      Choice "11/11" "<</cupsCompression 86>>setpagedevice"
+      Choice "10/10" "<</cupsCompression 84>>setpagedevice"
+      Choice "11/11" "<</cupsCompression 87>>setpagedevice"
       Choice "12/12" "<</cupsCompression 90>>setpagedevice"
-      Choice "13/13" "<</cupsCompression 93>>setpagedevice"
-      Choice "14/14" "<</cupsCompression 96>>setpagedevice"
+      Choice "13/13" "<</cupsCompression 94>>setpagedevice"
+      Choice "14/14" "<</cupsCompression 97>>setpagedevice"
       Choice "15/15" "<</cupsCompression 100>>setpagedevice"
     Option "inPrintRate/Print Speed" PickOne DocumentSetup 20.0
       *Choice "Default/Printer Default" "<</cupsRowFeed 0>>setpagedevice"