Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--pdf/xpdf/pdf-document.cc14
2 files changed, 10 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 00eb23e..748c61b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 21 17:52:08 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * pdf/xpdf/pdf-document.cc (pdf_document_get_page_size): Patch
+ from Crispin Flowerday <gnome@flowerday.cx> to avoid rendering the
+ page when we get the page size.
+
2005-02-21 Marco Pesenti Gritti <marco@gnome.org>
* ps/ps-document.c: (ps_document_set_page), (ps_document_get_page):
diff --git a/pdf/xpdf/pdf-document.cc b/pdf/xpdf/pdf-document.cc
index 2a4e1aa..edb8122 100644
--- a/pdf/xpdf/pdf-document.cc
+++ b/pdf/xpdf/pdf-document.cc
@@ -363,19 +363,13 @@ pdf_document_get_page_size (EvDocument *document,
if (height)
*height = 1;
-
- if (page == -1 && document_validate_page (pdf_document)) {
- if (width)
- *width = pdf_document->out->getBitmapWidth();
- if (height)
- *height = pdf_document->out->getBitmapHeight();
- return;
- }
+ if (page == -1)
+ page = pdf_document->page;
the_page = pdf_document->doc->getCatalog ()->getPage (page);
if (the_page) {
- *width = (int) the_page->getWidth ();
- *height = (int) the_page->getHeight ();
+ *width = (int) ((the_page->getWidth () * pdf_document->scale) + 0.5);
+ *height = (int) ((the_page->getHeight () * pdf_document->scale) + 0.5);
}
}