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=0aabb55f537d5172eee03589cd0bcaee09cfbdaf;hpb=1561766454d8a06d887da5c2955b8c4d1dddd9a3;p=evince.git

diff --git a/pixbuf/pixbuf-document.c b/pixbuf/pixbuf-document.c
index 0aabb55f..5147293a 100644
--- a/pixbuf/pixbuf-document.c
+++ b/pixbuf/pixbuf-document.c
@@ -20,11 +20,6 @@
 #include "pixbuf-document.h"
 #include "ev-document-thumbnails.h"
 
-enum {
-	PROP_0,
-	PROP_TITLE
-};
-
 struct _PixbufDocumentClass
 {
 	GObjectClass parent_class;
@@ -35,9 +30,6 @@ struct _PixbufDocument
 	GObject parent_instance;
 
 	GdkPixbuf *pixbuf;
-	GdkDrawable *target;
-
-	gint x_offset, y_offset;
 };
 
 typedef struct _PixbufDocumentClass PixbufDocumentClass;
@@ -100,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
@@ -129,44 +124,12 @@ pixbuf_document_finalize (GObject *object)
 	G_OBJECT_CLASS (pixbuf_document_parent_class)->finalize (object);
 }
 
-static void
-pixbuf_document_set_property (GObject *object,
-		              guint prop_id,
-			      const GValue *value,
-			      GParamSpec *pspec)
-{
-	switch (prop_id)
-	{
-		case PROP_TITLE:
-			/* read only */
-			break;
-	}
-}
-
-static void
-pixbuf_document_get_property (GObject *object,
-		              guint prop_id,
-		              GValue *value,
-		              GParamSpec *pspec)
-{
-	switch (prop_id)
-	{
-		case PROP_TITLE:
-			g_value_set_string (value, NULL);
-			break;
-	}
-}
-
 static void
 pixbuf_document_class_init (PixbufDocumentClass *klass)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
 	gobject_class->finalize = pixbuf_document_finalize;
-	gobject_class->get_property = pixbuf_document_get_property;
-	gobject_class->set_property = pixbuf_document_set_property;
-
-	g_object_class_override_property (gobject_class, PROP_TITLE, "title");
 }
 
 static gboolean
@@ -175,6 +138,17 @@ pixbuf_document_can_get_text (EvDocument *document)
 	return FALSE;
 }
 
+static EvDocumentInfo *
+pixbuf_document_get_info (EvDocument *document)
+{
+	EvDocumentInfo *info;
+
+	info = g_new0 (EvDocumentInfo, 1);
+	info->fields_mask = 0;
+
+	return info;
+}
+
 static void
 pixbuf_document_document_iface_init (EvDocumentIface *iface)
 {
@@ -184,16 +158,18 @@ pixbuf_document_document_iface_init (EvDocumentIface *iface)
 	iface->get_n_pages = pixbuf_document_get_n_pages;
 	iface->get_page_size = pixbuf_document_get_page_size;
 	iface->render_pixbuf = pixbuf_document_render_pixbuf;
+	iface->get_info = pixbuf_document_get_info;
 }
 
 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;
 	
@@ -203,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
@@ -234,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;
 }