]>
Commit | Line | Data |
---|---|---|
98eddd8d JR |
1 | diff -up cups-filters-1.0.40/filter/pdftops.c.pdf-landscape cups-filters-1.0.40/filter/pdftops.c |
2 | --- cups-filters-1.0.40/filter/pdftops.c.pdf-landscape 2013-10-11 17:15:45.639623613 +0100 | |
3 | +++ cups-filters-1.0.40/filter/pdftops.c 2013-10-11 17:22:41.517421905 +0100 | |
4 | @@ -273,7 +273,6 @@ main(int argc, /* I - Number of comm | |
5 | *pstops_options, /* Options for pstops filter */ | |
6 | *pstops_end; /* End of pstops filter option */ | |
7 | const char *cups_serverbin; /* CUPS_SERVERBIN environment variable */ | |
8 | - const char *content_type; /* CONTENT_TYPE environment variable */ | |
9 | #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) | |
10 | struct sigaction action; /* Actions for POSIX signals */ | |
11 | #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ | |
12 | @@ -457,7 +456,6 @@ main(int argc, /* I - Number of comm | |
13 | * Build the command-line for the pdftops or gs filter... | |
14 | */ | |
15 | ||
16 | - content_type = getenv("CONTENT_TYPE"); | |
17 | if (renderer == PDFTOPS) | |
18 | { | |
19 | pdf_argv[0] = (char *)"pdftops"; | |
20 | @@ -646,25 +644,17 @@ main(int argc, /* I - Number of comm | |
21 | else if ((renderer == PDFTOPS) || (renderer == PDFTOCAIRO)) | |
22 | { | |
23 | /* | |
24 | - * Use the page sizes of the original PDF document, this way documents | |
25 | - * which contain pages of different sizes can be printed correctly | |
26 | + * No options to add. Note: pdftopdf has already rotated pages | |
27 | + * for us. | |
28 | */ | |
29 | - | |
30 | - /* Only do this for unprocessed PDF files */ | |
31 | - if (content_type && !strstr (content_type, "/vnd.cups-")) | |
32 | - pdf_argv[pdf_argc++] = (char *)"-origpagesizes"; | |
33 | } | |
34 | #endif /* HAVE_POPPLER_PDFTOPS_WITH_ORIGPAGESIZES */ | |
35 | else if (renderer == ACROREAD) | |
36 | { | |
37 | /* | |
38 | - * Use the page sizes of the original PDF document, this way documents | |
39 | - * which contain pages of different sizes can be printed correctly | |
40 | + * No options to add. Note: pdftopdf has already rotated pages | |
41 | + * for us. | |
42 | */ | |
43 | - | |
44 | - /* Only do this for unprocessed PDF files */ | |
45 | - if (content_type && !strstr (content_type, "/vnd.cups-")) | |
46 | - pdf_argv[pdf_argc++] = (char *)"-choosePaperByPDFPageSize"; | |
47 | } | |
48 | ||
49 | /* |