Commit 46db73a1 authored by Kristian Høgsberg's avatar Kristian Høgsberg

2006-02-28 Kristian Høgsberg <krh@redhat.com>

        * poppler/PSOutputDev.cc: Make PSOutputDev constructor respect
        passed in paper size (#5946, #5749).
parent 0f7f2182
2006-02-28 Kristian Høgsberg <krh@redhat.com>
* poppler/PSOutputDev.cc: Make PSOutputDev constructor respect
passed in paper size (#5946, #5749).
2006-02-28 Kristian Høgsberg <krh@redhat.com>
* glib/poppler-document.cc (info_dict_get_string): Refactor
......
......@@ -994,9 +994,6 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
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 outputFuncA, void *outputStreamA,
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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment