[evince] [pdf] Add support for Attachment annotations
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evince] [pdf] Add support for Attachment annotations
- Date: Mon, 16 Nov 2009 13:31:35 +0000 (UTC)
commit a4bae5a203bdaff80f3001fba17bd2e93bca4ea5
Author: Carlos Garcia Campos <carlosgc gnome org>
Date: Mon Nov 16 14:19:27 2009 +0100
[pdf] Add support for Attachment annotations
See bgo#601839
backend/pdf/ev-poppler.cc | 54 +++++++++++++++++++++++++++++++++++++++-----
configure.ac | 1 +
2 files changed, 48 insertions(+), 7 deletions(-)
---
diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 917529e..503e468 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -144,12 +144,16 @@ static void pdf_document_thumbnails_get_dimensions (EvDocumentThumbnails
gint *height);
static int pdf_document_get_n_pages (EvDocument *document);
-static EvLinkDest *ev_link_dest_from_dest (PdfDocument *pdf_document,
- PopplerDest *dest);
-static EvLink *ev_link_from_action (PdfDocument *pdf_document,
- PopplerAction *action);
-static void pdf_document_search_free (PdfDocumentSearch *search);
-static void pdf_print_context_free (PdfPrintContext *ctx);
+static EvLinkDest *ev_link_dest_from_dest (PdfDocument *pdf_document,
+ PopplerDest *dest);
+static EvLink *ev_link_from_action (PdfDocument *pdf_document,
+ PopplerAction *action);
+static void pdf_document_search_free (PdfDocumentSearch *search);
+static void pdf_print_context_free (PdfPrintContext *ctx);
+static gboolean attachment_save_to_buffer (PopplerAttachment *attachment,
+ gchar **buffer,
+ gsize *buffer_size,
+ GError **error);
EV_BACKEND_REGISTER_WITH_CODE (PdfDocument, pdf_document,
{
@@ -2507,7 +2511,7 @@ ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
const gchar *unimplemented_annot = NULL;
switch (poppler_annot_get_annot_type (poppler_annot)) {
- case POPPLER_ANNOT_TEXT:
+ case POPPLER_ANNOT_TEXT: {
PopplerAnnotText *poppler_text;
EvAnnotationText *ev_annot_text;
@@ -2517,8 +2521,44 @@ ev_annot_from_poppler_annot (PopplerAnnot *poppler_annot,
ev_annot_text = EV_ANNOTATION_TEXT (ev_annot);
ev_annot_text->is_open = poppler_annot_text_get_is_open (poppler_text);
+ }
+ break;
+#ifdef HAVE_POPPLER_ANNOT_FILE_ATTACHMENT_GET_ATTACHMENT
+ case POPPLER_ANNOT_FILE_ATTACHMENT: {
+ PopplerAnnotFileAttachment *poppler_annot_attachment;
+ EvAnnotationAttachment *ev_annot_attachment;
+ PopplerAttachment *poppler_attachment;
+ gchar *data = NULL;
+ gsize size;
+ GError *error = NULL;
+
+ poppler_annot_attachment = POPPLER_ANNOT_FILE_ATTACHMENT (poppler_annot);
+ poppler_attachment = poppler_annot_file_attachment_get_attachment (poppler_annot_attachment);
+
+ if (poppler_attachment &&
+ attachment_save_to_buffer (poppler_attachment, &data, &size, &error)) {
+ EvAttachment *ev_attachment;
+ gchar *name;
+
+ name = poppler_annot_file_attachment_get_name (poppler_annot_attachment);
+ ev_attachment = ev_attachment_new (name,
+ poppler_attachment->description,
+ poppler_attachment->mtime,
+ poppler_attachment->ctime,
+ size, data);
+ g_free (name);
+ ev_annot = ev_annotation_attachment_new (page, ev_attachment);
+ g_object_unref (ev_attachment);
+ } else if (error) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
+ if (poppler_attachment)
+ g_object_unref (poppler_attachment);
+ }
break;
+#endif /* HAVE_POPPLER_ANNOT_FILE_ATTACHMENT_GET_ATTACHMENT */
case POPPLER_ANNOT_LINK:
case POPPLER_ANNOT_WIDGET:
/* Ignore link and widgets annots since they are already handled */
diff --git a/configure.ac b/configure.ac
index d4fd9be..a846d77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -485,6 +485,7 @@ if test "x$enable_pdf" = "xyes"; then
LIBS="$LIBS $POPPLER_LIBS"
AC_CHECK_FUNCS(poppler_page_render)
AC_CHECK_FUNCS(poppler_page_get_image)
+ AC_CHECK_FUNCS(poppler_annot_file_attachment_get_attachment)
LIBS=$evince_save_LIBS
PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]