X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=djvu%2Fdjvu-document.c;h=9f22537f3751fd76c558095c8f3ea24ab6496c09;hb=b66c8a73177b462aebcb6e495341807abb31a93f;hp=aa853a71e68d72c1be4518d733c929ac9bf1195f;hpb=560a7e43fe1f899e72130cb4ab1175d325f8e43c;p=evince.git

diff --git a/djvu/djvu-document.c b/djvu/djvu-document.c
index aa853a71..9f22537f 100644
--- a/djvu/djvu-document.c
+++ b/djvu/djvu-document.c
@@ -116,32 +116,26 @@ djvu_document_get_page_size (EvDocument   *document,
 			       double       *height)
 {
 	DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
-
-	ddjvu_page_t *d_page;
+        ddjvu_pageinfo_t info;
 	
 	g_return_if_fail (djvu_document->d_document);
 	
-	d_page = ddjvu_page_create_by_pageno (djvu_document->d_document, page);
-
-	while (!ddjvu_page_decoding_done (d_page)) {
+	while (ddjvu_document_get_pageinfo(djvu_document->d_document, page, &info) < DDJVU_JOB_OK) {
 		    ddjvu_message_wait (djvu_document->d_context);
 		    ddjvu_message_pop (djvu_document->d_context);	
 	}
 
-	if (width)
-		*width = ddjvu_page_get_width (d_page) * SCALE_FACTOR;
-	if (height)
-		*height = ddjvu_page_get_height (d_page) * SCALE_FACTOR;
-	
-	ddjvu_page_release (d_page);
+        *width = info.width * SCALE_FACTOR; 
+        *height = info.height * SCALE_FACTOR;
 }
 
 static GdkPixbuf *
 djvu_document_render_pixbuf (EvDocument  *document, 
-			     int page, gdouble scale)
+			     EvRenderContext *rc)
 {
 	DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
 	GdkPixbuf *pixbuf;
+	GdkPixbuf *rotated_pixbuf;
 	
     	ddjvu_rect_t rrect;
 	ddjvu_rect_t prect;
@@ -149,15 +143,15 @@ djvu_document_render_pixbuf (EvDocument  *document,
 	
 	double page_width, page_height;
 
-	d_page = ddjvu_page_create_by_pageno (djvu_document->d_document, page);
+	d_page = ddjvu_page_create_by_pageno (djvu_document->d_document, rc->page);
 	
 	while (!ddjvu_page_decoding_done (d_page)) {
 		    ddjvu_message_wait (djvu_document->d_context);
 		    ddjvu_message_pop (djvu_document->d_context);	
 	}
 	
-	page_width = ddjvu_page_get_width (d_page) * scale * SCALE_FACTOR;
-	page_height = ddjvu_page_get_height (d_page) * scale * SCALE_FACTOR;
+	page_width = ddjvu_page_get_width (d_page) * rc->scale * SCALE_FACTOR;
+	page_height = ddjvu_page_get_height (d_page) * rc->scale * SCALE_FACTOR;
 
 	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, page_width, page_height);
 
@@ -172,8 +166,10 @@ djvu_document_render_pixbuf (EvDocument  *document,
                 	  gdk_pixbuf_get_rowstride (pixbuf),
                           (gchar *)gdk_pixbuf_get_pixels (pixbuf));
 	
-    
-	return pixbuf;
+	rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rc->rotation);
+	g_object_unref (pixbuf);
+	
+	return rotated_pixbuf;
 }
 
 static void
@@ -249,11 +245,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;
@@ -262,15 +259,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, TRUE, 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);
@@ -282,8 +274,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