? .bzr
? glib/.poppler-page.cc.swp
? glib/poppler-features.h
? poppler/.GfxState.h.swp
? poppler/.Page.cc.swp
? poppler/.Page.h.swp
Index: glib/poppler-page.cc
===================================================================
RCS file: /cvs/poppler/poppler/glib/poppler-page.cc,v
retrieving revision 1.47
diff -u -p -r1.47 poppler-page.cc
--- glib/poppler-page.cc	2 May 2006 04:38:39 -0000	1.47
+++ glib/poppler-page.cc	15 May 2006 10:53:12 -0000
@@ -91,14 +91,8 @@ poppler_page_get_size (PopplerPage *page
 
   g_return_if_fail (POPPLER_IS_PAGE (page));
 
-  rotate = page->page->getRotate ();
-  if (rotate == 90 || rotate == 270) {
-    page_height = page->page->getCropWidth ();
-    page_width = page->page->getCropHeight ();
-  } else {
-    page_width = page->page->getCropWidth ();
-    page_height = page->page->getCropHeight ();
-  }
+  page_width = page->page->getCropWidth ();
+  page_height = page->page->getCropHeight ();
 
   if (width != NULL)
     *width = page_width;
@@ -143,7 +137,12 @@ poppler_page_prepare_output_dev (Poppler
   int cairo_width, cairo_height, cairo_rowstride;
   unsigned char *cairo_data;
 
-  poppler_page_get_size (page, &width, &height);
+  if (rotation == 90 || rotation == 270) {
+    poppler_page_get_size (page, &height, &width);
+  } else {
+    poppler_page_get_size (page, &width, &height);
+  }
+
   cairo_width = (int) ceil(width * scale);
   cairo_height = (int) ceil(height * scale);