X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=backend%2Fps%2Fev-spectre.c;h=54b595700551c39219ee7de47b2cf1ff1d4c5a21;hb=14def5e0c1c11cee1523e10c72df74f4cf5e451d;hp=1252b8d2faa18c07b7dc9c51b747d4ad4d0d44f5;hpb=4207c30cf856a79bc6e23219bf43554470cd4b0b;p=evince.git

diff --git a/backend/ps/ev-spectre.c b/backend/ps/ev-spectre.c
index 1252b8d2..54b59570 100644
--- a/backend/ps/ev-spectre.c
+++ b/backend/ps/ev-spectre.c
@@ -47,10 +47,10 @@ static void ps_document_document_thumbnails_iface_init (EvDocumentThumbnailsIfac
 
 EV_BACKEND_REGISTER_WITH_CODE (PSDocument, ps_document,
                          {
-				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-							ps_document_document_thumbnails_iface_init);
-				 G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
-							ps_document_file_exporter_iface_init);
+				 EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
+								 ps_document_document_thumbnails_iface_init);
+				 EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
+								 ps_document_file_exporter_iface_init);
 			 });
 
 /* PSDocument */
@@ -164,6 +164,22 @@ ps_document_get_n_pages (EvDocument *document)
 	return spectre_document_get_n_pages (ps->doc);
 }
 
+static EvPage *
+ps_document_get_page (EvDocument *document,
+		      gint        index)
+{
+	PSDocument  *ps = PS_DOCUMENT (document);
+	SpectrePage *ps_page;
+	EvPage      *page;
+
+	ps_page = spectre_document_get_page (ps->doc, index);
+	page = ev_page_new (index);
+	page->backend_page = (EvBackendPage)ps_page;
+	page->backend_destroy_func = (EvBackendPageDestroyFunc)spectre_page_free;
+
+	return page;
+}
+
 static gint
 get_page_rotation (SpectrePage *page)
 {
@@ -184,17 +200,17 @@ get_page_rotation (SpectrePage *page)
 
 static void
 ps_document_get_page_size (EvDocument *document,
-			   int         page,
+			   EvPage     *page,
 			   double     *width,
 			   double     *height)
 {
-	PSDocument  *ps = PS_DOCUMENT (document);
 	SpectrePage *ps_page;
 	gdouble      page_width, page_height;
 	gint         pwidth, pheight;
 	gint         rotate;
 
-	ps_page = spectre_document_get_page (ps->doc, page);
+	ps_page = (SpectrePage *)page->backend_page;
+
 	spectre_page_get_size (ps_page, &pwidth, &pheight);
 
 	rotate = get_page_rotation (ps_page);
@@ -206,8 +222,6 @@ ps_document_get_page_size (EvDocument *document,
 		page_height = pheight;
 	}
 
-	spectre_page_free (ps_page);
-	
 	if (width) {
 		*width = page_width;
 	}
@@ -219,17 +233,9 @@ ps_document_get_page_size (EvDocument *document,
 
 static char *
 ps_document_get_page_label (EvDocument *document,
-			    int         page)
+			    EvPage     *page)
 {
-	PSDocument  *ps = PS_DOCUMENT (document);
-	SpectrePage *ps_page;
-	gchar       *label;
-
-	ps_page = spectre_document_get_page (ps->doc, page);
-	label = g_strdup (spectre_page_get_label (ps_page));
-	spectre_page_free (ps_page);
-	
-	return label;
+	return g_strdup (spectre_page_get_label ((SpectrePage *)page->backend_page));
 }
 
 static EvDocumentInfo *
@@ -268,7 +274,6 @@ static cairo_surface_t *
 ps_document_render (EvDocument      *document,
 		    EvRenderContext *rc)
 {
-	PSDocument           *ps = PS_DOCUMENT (document);
 	SpectrePage          *ps_page;
 	SpectreRenderContext *src;
 	gint                  width_points;
@@ -281,7 +286,8 @@ ps_document_render (EvDocument      *document,
 	cairo_surface_t      *surface;
 	static const cairo_user_data_key_t key;
 
-	ps_page = spectre_document_get_page (ps->doc, rc->page);
+	ps_page = (SpectrePage *)rc->page->backend_page;
+	
 	spectre_page_get_size (ps_page, &width_points, &height_points);
 
 	width = (gint) ((width_points * rc->scale) + 0.5);
@@ -297,20 +303,16 @@ ps_document_render (EvDocument      *document,
 	spectre_render_context_free (src);
 
 	if (!data) {
-		spectre_page_free (ps_page);
 		return NULL;
 	}
 
 	if (spectre_page_status (ps_page)) {
 		g_warning (spectre_status_to_string (spectre_page_status (ps_page)));
 		g_free (data);
-		spectre_page_free (ps_page);
 		
 		return NULL;
 	}
 
-	spectre_page_free (ps_page);
-
 	if (rotation == 90 || rotation == 270) {
 		swidth = height;
 		sheight = width;
@@ -334,6 +336,7 @@ ps_document_document_iface_init (EvDocumentIface *iface)
 	iface->load = ps_document_load;
 	iface->save = ps_document_save;
 	iface->get_n_pages = ps_document_get_n_pages;
+	iface->get_page = ps_document_get_page;
 	iface->get_page_size = ps_document_get_page_size;
 	iface->get_page_label = ps_document_get_page_label;
 	iface->get_info = ps_document_get_info;
@@ -351,6 +354,11 @@ ps_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
 	GdkPixbuf       *pixbuf = NULL;
 
 	surface = ps_document_render (EV_DOCUMENT (ps), rc);
+	if (!surface) {
+		g_warning ("Error rendering thumbnail");
+		return NULL;
+	}
+		
 	pixbuf = ev_document_misc_pixbuf_from_surface (surface);
 	cairo_surface_destroy (surface);
 
@@ -428,7 +436,7 @@ ps_document_file_exporter_do_page (EvFileExporter  *exporter,
 {
 	PSDocument *ps = PS_DOCUMENT (exporter);
 
-	spectre_exporter_do_page (ps->exporter, rc->page);
+	spectre_exporter_do_page (ps->exporter, rc->page->index);
 }
 
 static void