Tim Waugh 8b51fa
diff -up cups-filters-1.0.40/filter/pdftops.c.pdf-landscape cups-filters-1.0.40/filter/pdftops.c
Tim Waugh 8b51fa
--- cups-filters-1.0.40/filter/pdftops.c.pdf-landscape	2013-10-11 17:15:45.639623613 +0100
Tim Waugh 8b51fa
+++ cups-filters-1.0.40/filter/pdftops.c	2013-10-11 17:22:41.517421905 +0100
Tim Waugh 8b51fa
@@ -273,7 +273,6 @@ main(int  argc,				/* I - Number of comm
Tim Waugh 8b51fa
 		*pstops_options,	/* Options for pstops filter */
Tim Waugh 8b51fa
 		*pstops_end;		/* End of pstops filter option */
Tim Waugh 8b51fa
   const char	*cups_serverbin;	/* CUPS_SERVERBIN environment variable */
Tim Waugh 8b51fa
-  const char	*content_type;		/* CONTENT_TYPE environment variable */
Tim Waugh 8b51fa
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
Tim Waugh 8b51fa
   struct sigaction action;		/* Actions for POSIX signals */
Tim Waugh 8b51fa
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
Tim Waugh 8b51fa
@@ -457,7 +456,6 @@ main(int  argc,				/* I - Number of comm
Tim Waugh 8b51fa
   * Build the command-line for the pdftops or gs filter...
Tim Waugh 8b51fa
   */
Tim Waugh 8b51fa
 
Tim Waugh 8b51fa
-  content_type = getenv("CONTENT_TYPE");
Tim Waugh 8b51fa
   if (renderer == PDFTOPS)
Tim Waugh 8b51fa
   {
Tim Waugh 8b51fa
     pdf_argv[0] = (char *)"pdftops";
Tim Waugh 8b51fa
@@ -646,25 +644,17 @@ main(int  argc,				/* I - Number of comm
Tim Waugh 8b51fa
     else if ((renderer == PDFTOPS) || (renderer == PDFTOCAIRO))
Tim Waugh 8b51fa
     {
Tim Waugh 8b51fa
      /*
Tim Waugh 8b51fa
-      *  Use the page sizes of the original PDF document, this way documents
Tim Waugh 8b51fa
-      *  which contain pages of different sizes can be printed correctly
Tim Waugh 8b51fa
+      *  No options to add. Note: pdftopdf has already rotated pages
Tim Waugh 8b51fa
+      *  for us.
Tim Waugh 8b51fa
       */
Tim Waugh 8b51fa
-
Tim Waugh 8b51fa
-      /* Only do this for unprocessed PDF files */
Tim Waugh 8b51fa
-      if (content_type && !strstr (content_type, "/vnd.cups-"))
Tim Waugh 8b51fa
-        pdf_argv[pdf_argc++] = (char *)"-origpagesizes";
Tim Waugh 8b51fa
     }
Tim Waugh 8b51fa
 #endif /* HAVE_POPPLER_PDFTOPS_WITH_ORIGPAGESIZES */
Tim Waugh 8b51fa
     else if (renderer == ACROREAD)
Tim Waugh 8b51fa
     {
Tim Waugh 8b51fa
      /*
Tim Waugh 8b51fa
-      * Use the page sizes of the original PDF document, this way documents
Tim Waugh 8b51fa
-      * which contain pages of different sizes can be printed correctly
Tim Waugh 8b51fa
+      *  No options to add. Note: pdftopdf has already rotated pages
Tim Waugh 8b51fa
+      *  for us.
Tim Waugh 8b51fa
       */
Tim Waugh 8b51fa
-     
Tim Waugh 8b51fa
-      /* Only do this for unprocessed PDF files */
Tim Waugh 8b51fa
-      if (content_type && !strstr (content_type, "/vnd.cups-"))
Tim Waugh 8b51fa
-        pdf_argv[pdf_argc++] = (char *)"-choosePaperByPDFPageSize";
Tim Waugh 8b51fa
     }
Tim Waugh 8b51fa
 
Tim Waugh 8b51fa
    /*