Attachment 4716 Details for Bug 5946 – Proposed patch

[patch] Proposed patch

patch.diff (text/plain), 1.27 KB, created by Nickolay V. Shmyrev on 2006-02-22 11:19:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nickolay V. Shmyrev

Created: 2006-02-22 11:19:41 UTC

Size: 1.27 KB

patch

obsolete

>Index: poppler/PSOutputDev.cc
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/PSOutputDev.cc,v
>retrieving revision 1.9
>diff -u -p -r1.9 PSOutputDev.cc
>--- poppler/PSOutputDev.cc	13 Feb 2006 22:38:44 -0000	1.9
>+++ poppler/PSOutputDev.cc	22 Feb 2006 00:17:16 -0000
>@@ -994,9 +994,6 @@ void PSOutputDev::init(PSOutputFunc outp
>   imgLLY = imgLLYA;
>   imgURX = imgURXA;
>   imgURY = imgURYA;
>-  if (imgLLX == 0 && imgURX == 0 && imgLLY == 0 && imgURY == 0) {
>-    globalParams->getPSImageableArea(&imgLLX, &imgLLY, &imgURX, &imgURY);
>-  }
>   if (paperWidth < 0 || paperHeight < 0) {
>     // this check is needed in case the document has zero pages
>     if (firstPage > 0 && firstPage <= catalog->getNumPages()) {
>@@ -1007,9 +1004,14 @@ void PSOutputDev::init(PSOutputFunc outp
>       paperWidth = 1;
>       paperHeight = 1;
>     }
>-    imgLLX = imgLLY = 0;
>-    imgURX = paperWidth;
>-    imgURY = paperHeight;
>+  }
>+  if (imgLLX == 0 && imgURX == 0 && imgLLY == 0 && imgURY == 0) {
>+    globalParams->getPSImageableArea(&imgLLX, &imgLLY, &imgURX, &imgURY);
>+    if (imgURX <= 0 || imgURY <= 0) {
>+      imgLLX = imgLLY = 0;
>+      imgURX = paperWidth;
>+      imgURY = paperHeight;
>+    }
>   }
>   manualCtrl = manualCtrlA;
>   if (mode == psModeForm) {

Actions: View | Splinter Review

Attachments on bug 5946: 4716

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.