X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=djvu%2Fdjvu-document.c;h=135d81cfa144bf97e75a5f2108f85fe00070eaf5;hb=f0d0dfdce5afb47592d95da8308ed02d471f16e5;hp=25cdb075778153a4ba80cc177274a7c458599f0a;hpb=1b167536f9277df8953cc30a531c1c17eab10382;p=evince.git

diff --git a/djvu/djvu-document.c b/djvu/djvu-document.c
index 25cdb075..135d81cf 100644
--- a/djvu/djvu-document.c
+++ b/djvu/djvu-document.c
@@ -45,7 +45,7 @@ struct _DjvuDocument
 	ddjvu_document_t *d_document;
 	ddjvu_format_t   *d_format;
 	
-	EvOrientation    orientation;
+	gchar *uri;
 };
 
 typedef struct _DjvuDocumentClass DjvuDocumentClass;
@@ -87,6 +87,8 @@ djvu_document_load (EvDocument  *document,
 		    ddjvu_message_wait (djvu_document->d_context);
 		    ddjvu_message_pop (djvu_document->d_context);	
 	}
+	g_free (djvu_document->uri);
+	djvu_document->uri = g_strdup (uri);
 
 	return TRUE;
 }
@@ -97,8 +99,9 @@ djvu_document_save (EvDocument  *document,
 		      const char  *uri,
 		      GError     **error)
 {
-	g_warning ("djvu_document_save not implemented"); /* FIXME */
-	return TRUE;
+	DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
+
+	return ev_xfer_uri_simple (djvu_document->uri, uri, error);
 }
 
 static int
@@ -111,23 +114,6 @@ djvu_document_get_n_pages (EvDocument  *document)
 	return ddjvu_document_get_pagenum (djvu_document->d_document);
 }
 
-static EvOrientation
-djvu_document_get_orientation (EvDocument *document)
-{
-	DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
-
-	return djvu_document->orientation;
-}
-
-static void
-djvu_document_set_orientation (EvDocument *document,
-		 	      EvOrientation   orientation)
-{
-	DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
-
-	djvu_document->orientation = orientation;
-}
-
 static void
 djvu_document_get_page_size (EvDocument   *document,
 			       int           page,
@@ -144,32 +130,8 @@ djvu_document_get_page_size (EvDocument   *document,
 		    ddjvu_message_pop (djvu_document->d_context);	
 	}
 
-	if (djvu_document->orientation == EV_ORIENTATION_PORTRAIT ||
-            djvu_document->orientation ==  EV_ORIENTATION_UPSIDEDOWN) {
-	        *width = info.width * SCALE_FACTOR; 
-	        *height = info.height * SCALE_FACTOR;
-	} else {
-	        *width = info.height * SCALE_FACTOR;
-	        *height = info.width * SCALE_FACTOR;
-	}
-}
-
-static GdkPixbuf *
-rotate_pixbuf (EvDocument *document, GdkPixbuf *pixbuf)
-{
-	DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
-
-	switch (djvu_document->orientation)
-	{
-		case EV_ORIENTATION_LANDSCAPE:
-			return gdk_pixbuf_rotate_simple (pixbuf, 90);
-		case EV_ORIENTATION_UPSIDEDOWN:
-			return gdk_pixbuf_rotate_simple (pixbuf, 180);
-		case EV_ORIENTATION_SEASCAPE:
-			return gdk_pixbuf_rotate_simple (pixbuf, 270);
-		default:
-			return g_object_ref (pixbuf);
-	}
+        *width = info.width * SCALE_FACTOR; 
+        *height = info.height * SCALE_FACTOR;
 }
 
 static GdkPixbuf *
@@ -209,8 +171,7 @@ djvu_document_render_pixbuf (EvDocument  *document,
                 	  gdk_pixbuf_get_rowstride (pixbuf),
                           (gchar *)gdk_pixbuf_get_pixels (pixbuf));
 	
-    
-	rotated_pixbuf = rotate_pixbuf (document, pixbuf);
+	rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rc->rotation);
 	g_object_unref (pixbuf);
 	
 	return rotated_pixbuf;
@@ -226,6 +187,7 @@ djvu_document_finalize (GObject *object)
 
 	ddjvu_context_release (djvu_document->d_context);
 	ddjvu_format_release (djvu_document->d_format);
+	g_free (djvu_document->uri);
 	
 	G_OBJECT_CLASS (djvu_document_parent_class)->finalize (object);
 }
@@ -264,8 +226,6 @@ djvu_document_document_iface_init (EvDocumentIface *iface)
 	iface->get_page_size = djvu_document_get_page_size;
 	iface->render_pixbuf = djvu_document_render_pixbuf;
 	iface->get_info = djvu_document_get_info;
-	iface->set_orientation = djvu_document_set_orientation;
-	iface->get_orientation = djvu_document_get_orientation;
 }
 
 static void
@@ -291,11 +251,12 @@ djvu_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
 static GdkPixbuf *
 djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 					  gint 			 page,
+				  	  gint	                 rotation,
 					  gint			 width,
 					  gboolean 		 border)
 {
 	DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
-	GdkPixbuf *pixbuf;
+	GdkPixbuf *pixbuf, *rotated_pixbuf;
 	gint thumb_width, thumb_height;
 
 	guchar *pixels;
@@ -304,15 +265,10 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 	
 	djvu_document_thumbnails_get_dimensions (document, page, width, &thumb_width, &thumb_height);
 	
-	if (border) {
-		pixbuf = ev_document_misc_get_thumbnail_frame (thumb_width, thumb_height, NULL);
-		pixels = gdk_pixbuf_get_pixels (pixbuf) + gdk_pixbuf_get_rowstride (pixbuf) + 4;
-	} else {
-		pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-					 thumb_width, thumb_height);
-		gdk_pixbuf_fill (pixbuf, 0xffffffff);
-		pixels = gdk_pixbuf_get_pixels (pixbuf);
-	}
+	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+				 thumb_width, thumb_height);
+	gdk_pixbuf_fill (pixbuf, 0xffffffff);
+	pixels = gdk_pixbuf_get_pixels (pixbuf);
 	
 	while (ddjvu_thumbnail_status (djvu_document->d_document, page, 1) < DDJVU_JOB_OK) {
 		    ddjvu_message_wait (djvu_document->d_context);
@@ -324,8 +280,17 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 				djvu_document->d_format,
 				gdk_pixbuf_get_rowstride (pixbuf), 
 				(gchar *)pixels);
+
+	rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rotation);
+	g_object_unref (pixbuf);
+
+        if (border) {
+	      GdkPixbuf *tmp_pixbuf = rotated_pixbuf;
+	      rotated_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, 0, tmp_pixbuf);
+	      g_object_unref (tmp_pixbuf);
+	}
 	
-	return pixbuf;
+	return rotated_pixbuf;
 }
 
 static void