Bug 520141

Created attachment 359088 [details]
Proposed patch

Description of problem:

pstops will not place the page labels at the proper position when printing in landscape.

Version-Release number of selected component (if applicable):

cups-libs-1.3.7-11

How reproducible:

100% reproducible

Steps to Reproduce:
1. Create a Postscript printer queue
2. Print a text document with a page-label in landscape
   lpr -o "page-label=Hello landscape" /etc/passwd
  
Actual results:

The page label is not seen on the page

Expected results:

The page label is shown on the page in landscape mode

Additional info:

The page-label gets printed differently depending on the orientation of the document, but only for multiple sheet per page, and only for some values:

In do_setup() from filter/pstops.c the page-label is rotated only for 2 and 6 pages on each sheet:

  2015
  2016   if (doc->number_up == 2 || doc->number_up == 6)
  2017   {
  2018    /*
  2019     * For 2- and 6-up output, rotate the labels to match the orientation
  2020     * of the pages...
  2021     */
  2022
  2023     if (Orientation & 1)
  2024       write_label_prolog(doc, doc->page_label, PageBottom,
  2025                          PageWidth - PageLength + PageTop, PageLength);
  2026     else
  2027       write_label_prolog(doc, doc->page_label, PageLeft, PageRight,
  2028                          PageLength);
  2029   }
  2030   else
  2031     write_label_prolog(doc, doc->page_label, PageBottom, PageTop, PageWidth);
  2032 }
  2033 

When using landscape, the orientation is set initially to "1" (0 for portrait) in SetCommonOptions() from filter/common.c but that value is later overridden in copy_comments() from filter/pstops.c:

  [...]
  725     else if (!strncmp(line, "%cupsRotation:", 14))
  726     {
  727      /*
  728       * Reset orientation of document?
  729       */
  730
  731       int orient = (atoi(line + 14) / 90) & 3;
  732
  733       if (orient != Orientation)
  734       {
  735        /*
  736         * Yes, update things so that the pages come out right...
  737         */
  738
  739         Orientation = (4 - Orientation + orient) & 3;
  740         UpdatePageVars();
  741         Orientation = orient;
  742       }
  743     }
  [...]

By using the initial value passed for orientation to position the label, it shows on the page.

The attached patch does two things:

1. Save the original orientation to use it when positioning the label
2. Use that orientation to palce the label accordingly

This patch would need more intensive testing and review :)