From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Tue, 22 May 2007 10:04:21 +0000 (+0000)
Subject: Fix build with current poppler from cvs head.
X-Git-Tag: EVINCE_0_9_1~29
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=df3510ed9fdf66e192f89e222a1dfc867af2729d;p=evince.git

Fix build with current poppler from cvs head.

2007-05-22  Carlos Garcia Campos  <carlosgc@gnome.org>
	* configure.ac:
	* backend/pdf/ev-poppler.cc: (pdf_selection_render_selection):
	Fix build with current poppler from cvs head.

svn path=/trunk/; revision=2473
---

diff --git a/ChangeLog b/ChangeLog
index 4a3420a9..feb0cebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-22  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	* configure.ac:
+	* backend/pdf/ev-poppler.cc: (pdf_selection_render_selection):
+
+	Fix build with current poppler from cvs head. 
+
 2007-05-21  Eduardo Lima <eduardo.lima@indt.org.br>
 
 	* libdocument/ev-file-helpers.c: (ensure_dir_exists):
diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 1edbb489..68224647 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -1623,13 +1623,22 @@ pdf_selection_render_selection (EvSelection      *selection,
 					   TRUE, 8,
 					   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,
+						 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 */
 }
 
 
diff --git a/configure.ac b/configure.ac
index bdbe0d40..ce14c578 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,7 @@ if test "x$enable_pdf" = "xyes"; then
 	    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)