libcupsfilters: In pdftopdf() fix N-up printing with long-edge-first

If the printer takes the paper long-edge-first and the number-up
option for printing multiple pages per sheet is used, the grid for the
shrinked pages onm the output sheet is set wrongly (number of lines
and number of columns swapped). This commit fixes the this bug.

diff --git a/cupsfilters/pdftopdf/pdftopdf_processor.cc b/cupsfilters/pdftopdf/pdftopdf_processor.cc
index 0be531387fe4a0a9f9579da56222177c1d9e3348..3553833d2049ef4a652542f459dae26be9dc6053 100644 (file)
--- a/cupsfilters/pdftopdf/pdftopdf_processor.cc
+++ b/cupsfilters/pdftopdf/pdftopdf_processor.cc
@@ -174,12 +174,14 @@ bool processPDFTOPDF(PDFTOPDF_Processor &proc,ProcessingParameters &param,pdftop
     return false;
   }
 
-  if (param.autoRotate) {
-    const bool dst_lscape =
-      (param.paper_is_landscape ==
-       ((param.orientation == ROT_0) || (param.orientation == ROT_180)));
+  const bool dst_lscape =
+    (param.paper_is_landscape ==
+     ((param.orientation == ROT_0) || (param.orientation == ROT_180)));
+  if (dst_lscape)
+    std::swap(param.nup.nupX, param.nup.nupY);
+
+  if (param.autoRotate)
     proc.autoRotateAll(dst_lscape,param.normal_landscape);
-  }
 
   std::vector<std::shared_ptr<PDFTOPDF_PageHandle>> pages=proc.get_pages(doc);