X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=libdocument%2Fev-document.c;h=5e582d0aae3c9cfa8a3f5b10df4a73c5f7e2c604;hb=b8aebf2e1ba5b4f9ff1e1256b28acb3e23947c51;hp=a951bfa3fa83560534e113ba24ddbe38acc34112;hpb=13a06349251874bd35d2f03c3fc93217cee749a2;p=evince.git

diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c
index a951bfa3..5e582d0a 100644
--- a/libdocument/ev-document.c
+++ b/libdocument/ev-document.c
@@ -150,11 +150,26 @@ ev_document_get_n_pages (EvDocument  *document)
 	return retval;
 }
 
+EvPage *
+ev_document_get_page (EvDocument *document,
+		      gint        index)
+{
+	EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
+	EvPage *retval;
+
+	if (iface->get_page)
+		retval = iface->get_page (document, index);
+	else
+		retval = ev_page_new (index);
+
+	return retval;
+}
+
 void
-ev_document_get_page_size   (EvDocument   *document,
-			     int           page,
-			     double       *width,
-			     double       *height)
+ev_document_get_page_size (EvDocument *document,
+			   EvPage     *page,
+			   double     *width,
+			   double     *height)
 {
 	EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
 
@@ -163,8 +178,8 @@ ev_document_get_page_size   (EvDocument   *document,
 }
 
 char *
-ev_document_get_page_label(EvDocument    *document,
-			   int             page)
+ev_document_get_page_label (EvDocument *document,
+			    EvPage     *page)
 {
 	EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
 
@@ -175,14 +190,6 @@ ev_document_get_page_label(EvDocument    *document,
 	return iface->get_page_label (document, page);
 }
 
-gboolean
-ev_document_can_get_text (EvDocument  *document)
-{
-	EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
-
-	return iface->can_get_text (document);
-}
-
 EvDocumentInfo *
 ev_document_get_info (EvDocument *document)
 {
@@ -191,20 +198,6 @@ ev_document_get_info (EvDocument *document)
 	return iface->get_info (document);
 }
 
-char *
-ev_document_get_text (EvDocument  *document,
-		      int          page,
-		      EvRectangle *rect)
-{
-	EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
-	char *retval;
-
-	LOG ("ev_document_get_text");
-	retval = iface->get_text (document, page, rect);
-
-	return retval;
-}
-
 gboolean
 ev_document_has_attachments (EvDocument *document)
 {
@@ -230,17 +223,17 @@ ev_document_get_attachments (EvDocument *document)
 	return retval;
 }
 
-GdkPixbuf *
-ev_document_render_pixbuf (EvDocument      *document,
-			   EvRenderContext *rc)
+cairo_surface_t *
+ev_document_render (EvDocument      *document,
+		    EvRenderContext *rc)
 {
 	EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
-	GdkPixbuf *retval;
+	cairo_surface_t *retval;
 
 	LOG ("ev_document_render_pixbuf");
-	g_assert (iface->render_pixbuf);
+	g_assert (iface->render);
 
-	retval = iface->render_pixbuf (document, rc);
+	retval = iface->render (document, rc);
 
 	return retval;
 }
@@ -256,8 +249,11 @@ ev_document_info_free (EvDocumentInfo *info)
 	g_free (info->author);
 	g_free (info->subject);
 	g_free (info->keywords);
+	g_free (info->creator);
+	g_free (info->producer);
+	g_free (info->linearized);
 	g_free (info->security);
-
+	
 	g_free (info);
 }
 
@@ -279,3 +275,6 @@ ev_rect_cmp (EvRectangle *a,
 		  (ABS (a->x2 - b->x2) < EPSILON) &&
 		  (ABS (a->y2 - b->y2) < EPSILON));
 }
+
+
+