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=1b155bf47085bb08b6159155de8093ace50dd066;hpb=c3e1500a4815225f08e1b20dd066559e8c92c280;p=evince.git

diff --git a/djvu/djvu-document.c b/djvu/djvu-document.c
index 1b155bf4..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;
@@ -184,52 +185,28 @@ djvu_document_finalize (GObject *object)
 	G_OBJECT_CLASS (djvu_document_parent_class)->finalize (object);
 }
 
-static void
-djvu_document_set_property (GObject *object,
-		              guint prop_id,
-			      const GValue *value,
-			      GParamSpec *pspec)
-{
-	switch (prop_id)
-	{
-		case PROP_TITLE:
-			/* read only */
-			break;
-	}
-}
-
-static void
-djvu_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
 djvu_document_class_init (DjvuDocumentClass *klass)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
 	gobject_class->finalize = djvu_document_finalize;
-	gobject_class->get_property = djvu_document_get_property;
-	gobject_class->set_property = djvu_document_set_property;
+}
 
-	g_object_class_override_property (gobject_class, PROP_TITLE, "title");
+static gboolean
+djvu_document_can_get_text (EvDocument *document)
+{
+	return FALSE;
 }
 
-static char *
-djvu_document_get_text (EvDocument *document, gint page, EvRectangle *rect)
+static EvDocumentInfo *
+djvu_document_get_info (EvDocument *document)
 {
-	/* FIXME this method should not be in EvDocument */
-	g_warning ("djvu_document_get_text not implemented");
-	return NULL;
+	EvDocumentInfo *info;
+
+	info = g_new0 (EvDocumentInfo, 1);
+
+	return info;
 }
 
 static void
@@ -237,10 +214,11 @@ djvu_document_document_iface_init (EvDocumentIface *iface)
 {
 	iface->load = djvu_document_load;
 	iface->save = djvu_document_save;
-	iface->get_text = djvu_document_get_text;
+	iface->can_get_text = djvu_document_can_get_text;
 	iface->get_n_pages = djvu_document_get_n_pages;
 	iface->get_page_size = djvu_document_get_page_size;
 	iface->render_pixbuf = djvu_document_render_pixbuf;
+	iface->get_info = djvu_document_get_info;
 }
 
 static void
@@ -273,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);
 	
@@ -289,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;
 }