From 2fa78c4d755162b65978c1de43568742d075935a Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Sat, 02 Jun 2007 09:00:49 +0000
Subject: Bump requirements to poppler 0.5.9 and drop all ifdefs used.

2007-06-02  Carlos Garcia Campos  <carlosgc@gnome.org>
	* configure.ac:
	* backend/pdf/ev-poppler.cc: (pdf_document_images_get_images),
	(pdf_selection_render_selection), (pdf_document_get_page_duration):
	Bump requirements to poppler 0.5.9 and drop all ifdefs used.

svn path=/trunk/; revision=2482
---
diff --git a/ChangeLog b/ChangeLog
index f597624..d94e61b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-02  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	* configure.ac:
+	* backend/pdf/ev-poppler.cc: (pdf_document_images_get_images),
+	(pdf_selection_render_selection), (pdf_document_get_page_duration):
+
+	Bump requirements to poppler 0.5.9 and drop all ifdefs used.
+
 2007-05-25  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
 	* shell/ev-window.c: (ev_window_add_history):
diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 6822464..a3549b2 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -1135,7 +1135,6 @@ pdf_document_images_get_images (EvDocumentImages *document_images,
 				gint              page)
 {
 	GList *retval = NULL;
-#ifdef HAVE_POPPLER_PAGE_GET_IMAGE_MAPPING
 	PdfDocument *pdf_document;
 	PopplerPage *poppler_page;
 	GList *mapping_list;
@@ -1164,7 +1163,7 @@ pdf_document_images_get_images (EvDocumentImages *document_images,
 
 	poppler_page_free_image_mapping (mapping_list);
 	g_object_unref (poppler_page);
-#endif /* HAVE_POPPLER_PAGE_GET_IMAGE_MAPPING */
+
 	return retval;
 }
 
@@ -1624,21 +1623,13 @@ pdf_selection_render_selection (EvSelection      *selection,
 					   width, height);
 	}
 
-#ifdef HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF
 	poppler_page_render_selection_to_pixbuf (POPPLER_PAGE (rc->data),
 						 rc->scale, rc->rotation, *pixbuf,
 						 (PopplerRectangle *)points,
 						 (PopplerRectangle *)old_points,
+						 POPPLER_SELECTION_NORMAL, /* SelectionStyle */
 						 text,
 						 base);
-#else
-	poppler_page_render_selection (POPPLER_PAGE (rc->data),
-				       rc->scale, rc->rotation, *pixbuf,
-				       (PopplerRectangle *)points,
-				       (PopplerRectangle *)old_points,
-				       text,
-				       base);
-#endif /* HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF */
 }
 
 
@@ -1694,7 +1685,6 @@ static gdouble
 pdf_document_get_page_duration (EvDocumentTransition *trans,
 				gint                  page)
 {
-#ifdef HAVE_POPPLER_PAGE_GET_DURATION	
 	PdfDocument *pdf_document;
 	PopplerPage *poppler_page;
 	gdouble      duration = -1;
@@ -1708,9 +1698,6 @@ pdf_document_get_page_duration (EvDocumentTransition *trans,
 	g_object_unref (poppler_page);
 
 	return duration;
-#else
-	return -1;
-#endif /* HAVE_POPPLER_PAGE_GET_DURATION */
 }
 
 static void
diff --git a/configure.ac b/configure.ac
index ce14c57..391f0f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,7 +235,7 @@ AC_ARG_ENABLE(pdf,
               [AC_HELP_STRING([--enable-pdf], [Compile with pdf support])],enable_pdf="$enableval",enable_pdf=yes)
 
 if test "x$enable_pdf" = "xyes"; then
-    POPPLER_REQUIRED=0.5.4
+    POPPLER_REQUIRED=0.5.9
     PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED,enable_pdf=yes,enable_pdf=no)
 
     if test "x$enable_pdf" = "xyes"; then
@@ -247,9 +247,6 @@ if test "x$enable_pdf" = "xyes"; then
 	    evince_save_LIBS=$LIBS
 	    LIBS="$LIBS $FRONTEND_LIBS"
 	    AC_CHECK_FUNCS(poppler_page_render)
-	    AC_CHECK_FUNCS(poppler_page_get_duration)
-	    AC_CHECK_FUNCS(poppler_page_get_image_mapping)
-	    AC_CHECK_FUNCS(poppler_page_render_selection_to_pixbuf)
 	    LIBS=$evince_save_LIBS
 
 	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
--
cgit v0.9.1