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 4a3420a9f29658cddb10d462b51810a550ae9c85..feb0cebdfb161dd7f79e359a207896d1f380a9ad 100644 (file)
--- 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 1edbb4893c5f2011423319ed1801b5c48f492fc5..68224647c4a34ebf69f9367ec6eb8a79d24f2325 100644 (file)
--- 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 bdbe0d40601133fa2c8026ded3df1600ddf4cfb0..ce14c578295516a3c6e1e4ff720d6ac37f868b41 100644 (file)
--- 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)