X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=djvu%2Fdjvu-document.c;h=d82a643f799d4e42a0aa4bbe431fb5a1c087c39d;hb=dfbda438b1e9f7427e0a5efb5daed603e8a51d61;hp=e6a270f180602b1ef1260ae77a8e236c4844d918;hpb=1a9dc517d24c563078b45a9d1a0c82ef3c710fef;p=evince.git

diff --git a/djvu/djvu-document.c b/djvu/djvu-document.c
index e6a270f1..d82a643f 100644
--- a/djvu/djvu-document.c
+++ b/djvu/djvu-document.c
@@ -81,9 +81,11 @@ djvu_document_load (EvDocument  *document,
 
 	djvu_document->d_document = doc;
 
-	while (!ddjvu_document_decoding_done (djvu_document->d_document))
-		    ddjvu_message_wait (djvu_document->d_context);	
-		
+	while (!ddjvu_document_decoding_done (djvu_document->d_document)) {
+		    ddjvu_message_wait (djvu_document->d_context);
+		    ddjvu_message_pop (djvu_document->d_context);	
+	}
+
 	return TRUE;
 }
 
@@ -114,22 +116,19 @@ 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))
-		    ddjvu_message_wait (djvu_document->d_context);	
+	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;
+		*width = info.width * SCALE_FACTOR;
 	if (height)
-		*height = ddjvu_page_get_height (d_page) * SCALE_FACTOR;
-	
-	ddjvu_page_release (d_page);
+		*height = info.height * SCALE_FACTOR;
 }
 
 static GdkPixbuf *
@@ -147,8 +146,10 @@ djvu_document_render_pixbuf (EvDocument  *document,
 
 	d_page = ddjvu_page_create_by_pageno (djvu_document->d_document, page);
 	
-	while (!ddjvu_page_decoding_done (d_page))
-		    ddjvu_message_wait (djvu_document->d_context);	
+	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;
@@ -164,7 +165,7 @@ djvu_document_render_pixbuf (EvDocument  *document,
                           &rrect,
                           djvu_document->d_format,
                 	  gdk_pixbuf_get_rowstride (pixbuf),
-                          gdk_pixbuf_get_pixels (pixbuf));
+                          (gchar *)gdk_pixbuf_get_pixels (pixbuf));
 	
     
 	return pixbuf;
@@ -250,7 +251,7 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 	GdkPixbuf *pixbuf;
 	gint thumb_width, thumb_height;
 
-	gchar *pixels;
+	guchar *pixels;
 	
 	g_return_val_if_fail (djvu_document->d_document, NULL);
 	
@@ -266,14 +267,16 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 		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);	
+	while (ddjvu_thumbnail_status (djvu_document->d_document, page, 1) < DDJVU_JOB_OK) {
+		    ddjvu_message_wait (djvu_document->d_context);
+		    ddjvu_message_pop (djvu_document->d_context);	
+	}
 		    
 	ddjvu_thumbnail_render (djvu_document->d_document, page, 
 				&thumb_width, &thumb_height,
 				djvu_document->d_format,
 				gdk_pixbuf_get_rowstride (pixbuf), 
-				pixels);
+				(gchar *)pixels);
 	
 	return pixbuf;
 }