[poppler] poppler/glib: poppler-page.cc,1.28.2.6,1.28.2.7

[Kristian Høgsberg]

Update of /cvs/poppler/poppler/glib
In directory gabe:/tmp/cvs-serv20882/glib

Modified Files:
      Tag: POPPLER_0_4_X
	poppler-page.cc 
Log Message:
2005-09-01  Kristian Høgsberg  <krh at redhat.com>

        * NEWS:
        * configure.ac: Release 0.4.2.

        * glib/poppler-page.cc (poppler_page_prepare_output_dev): Patch
        from Marco to fix more rotation special cases.



Index: poppler-page.cc
===================================================================
RCS file: /cvs/poppler/poppler/glib/poppler-page.cc,v
retrieving revision 1.28.2.6
retrieving revision 1.28.2.7
diff -u -d -r1.28.2.6 -r1.28.2.7
--- poppler-page.cc	24 Aug 2005 18:17:51 -0000	1.28.2.6
+++ poppler-page.cc	2 Sep 2005 03:24:17 -0000	1.28.2.7
@@ -123,9 +123,12 @@
   CairoOutputDev *output_dev;
   cairo_surface_t *surface;
   int cairo_width, cairo_height, cairo_rowstride;
+  int rotate;
   unsigned char *cairo_data;
 
-  if (rotation == 90 || rotation == 270) {
+  rotate = (rotation + page->page->getRotate()) % 360;
+
+  if (rotate == 90 || rotate == 270) {
     cairo_width = MAX ((int)(page->page->getHeight() * scale + 0.5), 1);
     cairo_height = MAX ((int)(page->page->getWidth() * scale + 0.5), 1);
   } else {