X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pixbuf%2Fpixbuf-document.c;h=5147293a29945d934bdc3ad50f5ee3ece9dca6ee;hb=1ba681aa9eb43a60f0a01c1939e70f9f6de755c7;hp=18d357dfdb857b5d021aedc2faab8275dbff270c;hpb=6b05feae2e57d126f57a1f40527ff387070e9a73;p=evince.git

diff --git a/pixbuf/pixbuf-document.c b/pixbuf/pixbuf-document.c
index 18d357df..5147293a 100644
--- a/pixbuf/pixbuf-document.c
+++ b/pixbuf/pixbuf-document.c
@@ -30,9 +30,6 @@ struct _PixbufDocument
 	GObject parent_instance;
 
 	GdkPixbuf *pixbuf;
-	GdkDrawable *target;
-
-	gint x_offset, y_offset;
 };
 
 typedef struct _PixbufDocumentClass PixbufDocumentClass;
@@ -95,23 +92,26 @@ pixbuf_document_get_page_size (EvDocument   *document,
 {
 	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
 
-	if (width)
-		*width = gdk_pixbuf_get_width (pixbuf_document->pixbuf);
-	if (height)
-		*height = gdk_pixbuf_get_height (pixbuf_document->pixbuf);
-
-	printf ("get_page_size, page=%d, *width=%f, *height=%f\n",
-		page, *width, *height);
+	*width = gdk_pixbuf_get_width (pixbuf_document->pixbuf);
+	*height = gdk_pixbuf_get_height (pixbuf_document->pixbuf);
 }
 
 static GdkPixbuf*
-pixbuf_document_render_pixbuf (EvDocument  *document, int page, double scale)
+pixbuf_document_render_pixbuf (EvDocument      *document,
+			       EvRenderContext *rc)
 {
 	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
-	return gdk_pixbuf_scale_simple (pixbuf_document->pixbuf,
-					gdk_pixbuf_get_width (pixbuf_document->pixbuf) * scale,
-					gdk_pixbuf_get_height (pixbuf_document->pixbuf) * scale,
-					GDK_INTERP_BILINEAR);
+	GdkPixbuf *scaled_pixbuf, *rotated_pixbuf;
+
+	scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf_document->pixbuf,
+					         gdk_pixbuf_get_width (pixbuf_document->pixbuf) * rc->scale,
+					         gdk_pixbuf_get_height (pixbuf_document->pixbuf) * rc->scale,
+					         GDK_INTERP_BILINEAR);
+
+        rotated_pixbuf = gdk_pixbuf_rotate_simple (scaled_pixbuf, rc->rotation);
+        g_object_unref (scaled_pixbuf);
+
+	return rotated_pixbuf;
 }
 
 static void
@@ -164,11 +164,12 @@ pixbuf_document_document_iface_init (EvDocumentIface *iface)
 static GdkPixbuf *
 pixbuf_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 					  gint 			  page,
+					  gint 			  rotation,
 					  gint			  size,
 					  gboolean                border)
 {
 	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
-	GdkPixbuf *pixbuf;
+	GdkPixbuf *pixbuf, *rotated_pixbuf;
 	gdouble scale_factor;
 	gint height;
 	
@@ -178,8 +179,11 @@ pixbuf_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 	
 	pixbuf = gdk_pixbuf_scale_simple (pixbuf_document->pixbuf, size, height,
 					  GDK_INTERP_BILINEAR);
-	
-	return pixbuf;
+
+	rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, rotation);
+        g_object_unref (pixbuf);
+
+        return rotated_pixbuf;
 }
 
 static void
@@ -209,6 +213,4 @@ pixbuf_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface
 static void
 pixbuf_document_init (PixbufDocument *pixbuf_document)
 {
-	pixbuf_document->x_offset = 0;
-	pixbuf_document->y_offset = 0;
 }