s/PDF Version/Format

[evince.git] / djvu / djvu-document.c

diff --git a/djvu/djvu-document.c b/djvu/djvu-document.c
index 72be474bf3d76e9778b3d478cd312aa2362f618a..d82a643f799d4e42a0aa4bbe431fb5a1c087c39d 100644 (file)
--- 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;
@@ -266,8 +267,10 @@ 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,