X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fev-poppler.cc;h=bbcb978120ff4a82f2025302ede323cab6803b71;hb=48ab804ceec8229e351914ec863202418938d5fa;hp=610f598388a1bf093568a1ac12a2951f06a6cdb4;hpb=3f175f30d0eb1df7df8894c7ba0949e4cbd23e8f;p=evince.git

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index 610f5983..bbcb9781 100644
--- a/pdf/ev-poppler.cc
+++ b/pdf/ev-poppler.cc
@@ -243,30 +243,6 @@ pdf_document_get_n_pages (EvDocument *document)
 	return poppler_document_get_n_pages (PDF_DOCUMENT (document)->document);
 }
 
-static void
-set_page_orientation (PdfDocument *pdf_document, PopplerPage *page, int rotation)
-{
-	PopplerOrientation orientation;
-	int r = rotation;
-
-	orientation = poppler_page_get_orientation (page);
-
-	while (r > 0) {
-		if (orientation == POPPLER_ORIENTATION_PORTRAIT) {
-			orientation = POPPLER_ORIENTATION_LANDSCAPE;
-		} else if (orientation == POPPLER_ORIENTATION_LANDSCAPE) {
-			orientation = POPPLER_ORIENTATION_UPSIDEDOWN;
-		} else if (orientation == POPPLER_ORIENTATION_UPSIDEDOWN) {
-			orientation = POPPLER_ORIENTATION_SEASCAPE;
-		} else {
-			orientation = POPPLER_ORIENTATION_PORTRAIT;
-		}
-		r -= 90;
-	}
-
-	poppler_page_set_orientation (page, orientation);
-}
-
 static void
 pdf_document_get_page_size (EvDocument   *document,
 			    int           page,
@@ -351,11 +327,16 @@ pdf_document_render_pixbuf (EvDocument   *document,
 	pdf_document = PDF_DOCUMENT (document);
 
 	set_rc_data (pdf_document, rc);
-	set_page_orientation (pdf_document, POPPLER_PAGE (rc->data), rc->rotation);
 
 	poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points);
-	width = (int) ((width_points * rc->scale) + 0.5);
-	height = (int) ((height_points * rc->scale) + 0.5);
+
+	if (rc->rotation == 90 || rc->rotation == 270) {
+		width = (int) ((height_points * rc->scale) + 0.5);
+		height = (int) ((width_points * rc->scale) + 0.5);
+	} else {
+		width = (int) ((width_points * rc->scale) + 0.5);
+		height = (int) ((height_points * rc->scale) + 0.5);
+	}
 
 	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
 				 FALSE, 8,
@@ -365,6 +346,7 @@ pdf_document_render_pixbuf (EvDocument   *document,
 				       0, 0,
 				       width, height,
 				       rc->scale,
+				       rc->rotation,
 				       pixbuf);
 	
 	
@@ -819,7 +801,6 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
 	gdouble unscaled_width, unscaled_height;
 
 	poppler_page = poppler_document_get_page (pdf_document->document, page);
-	set_page_orientation (pdf_document, poppler_page, rotation);
 	g_return_val_if_fail (poppler_page != NULL, NULL);
 
 	pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page,
@@ -828,12 +809,22 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
 	scale = width / unscaled_width;
 
 	if (border) {
-		pixbuf = ev_document_misc_get_thumbnail_frame (width, height, NULL);
+		pixbuf = ev_document_misc_get_thumbnail_frame (width, height, rotation, NULL);
 
+		width = gdk_pixbuf_get_width (pixbuf);
+		height = gdk_pixbuf_get_height (pixbuf);
 		sub_pixbuf = gdk_pixbuf_new_subpixbuf (pixbuf,
 						       1, 1,
 						       width - 1, height - 1);
 	} else {
+		/* rotate */
+		if (rotation == 90 || rotation == 270) {
+			int temp;
+			temp = width;
+			width = height;
+			height = temp;
+		}
+
 		pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
 					 width, height);
 		gdk_pixbuf_fill (pixbuf, 0xffffffff);
@@ -844,7 +835,7 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
 
 	poppler_page_render_to_pixbuf (poppler_page, 0, 0,
 				       width, height,
-				       scale, sub_pixbuf);
+				       scale, rotation, sub_pixbuf);
 
 	g_object_unref (G_OBJECT (sub_pixbuf));
 
@@ -866,7 +857,6 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
 	pdf_document = PDF_DOCUMENT (document_thumbnails);
 
 	poppler_page = poppler_document_get_page (pdf_document->document, page);
-	set_page_orientation (pdf_document, poppler_page, rotation);
 	g_return_val_if_fail (poppler_page != NULL, NULL);
 
 	pixbuf = poppler_page_get_thumbnail (poppler_page);
@@ -876,7 +866,7 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
 		if (border) {
 			GdkPixbuf *real_pixbuf;
 
-			real_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf);
+			real_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);
 			g_object_unref (pixbuf);
 			pixbuf = real_pixbuf;
 		}
@@ -1153,7 +1143,6 @@ pdf_document_ps_exporter_do_page (EvPSExporter *exporter, EvRenderContext *rc)
 	g_return_if_fail (pdf_document->ps_file != NULL);
 
 	poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
-	set_page_orientation (pdf_document, poppler_page, rc->rotation);
 	poppler_page_render_to_ps (poppler_page, pdf_document->ps_file);
 	g_object_unref (poppler_page);
 }
@@ -1192,8 +1181,6 @@ pdf_selection_render_selection (EvSelection      *selection,
 	pdf_document = PDF_DOCUMENT (selection);
 	set_rc_data (pdf_document, rc);
 
-	set_page_orientation (pdf_document, POPPLER_PAGE (rc->data), rc->rotation);
-
 	poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points);
 	width = (int) ((width_points * rc->scale) + 0.5);
 	height = (int) ((height_points * rc->scale) + 0.5);
@@ -1205,7 +1192,7 @@ pdf_selection_render_selection (EvSelection      *selection,
 	}
 	
 	poppler_page_render_selection (POPPLER_PAGE (rc->data),
-				       rc->scale, *pixbuf,
+				       rc->scale, rc->rotation, *pixbuf,
 				       (PopplerRectangle *)points,
 				       (PopplerRectangle *)old_points,
 				       text,
@@ -1224,7 +1211,6 @@ pdf_selection_get_selection_region (EvSelection     *selection,
 	pdf_document = PDF_DOCUMENT (selection);
 
 	set_rc_data (pdf_document, rc);
-	set_page_orientation (pdf_document, POPPLER_PAGE (rc->data), rc->rotation);
 
 	retval = poppler_page_get_selection_region ((PopplerPage *)rc->data, rc->scale, (PopplerRectangle *) points);
 
@@ -1243,7 +1229,6 @@ pdf_selection_get_selection_map (EvSelection     *selection,
 	pdf_document = PDF_DOCUMENT (selection);
 	poppler_page = poppler_document_get_page (pdf_document->document,
 						  rc->page);
-	set_page_orientation (pdf_document, poppler_page, rc->rotation);
 
 	points.x1 = 0.0;
 	points.y1 = 0.0;