Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--backend/pdf/ev-poppler.cc60
-rw-r--r--configure.ac14
3 files changed, 18 insertions, 63 deletions
diff --git a/ChangeLog b/ChangeLog
index 429b6b3..2e3c1ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-12 Carlos Garcia Campos <carlosgc@gnome.org>
+
+ * configure.ac:
+ * backend/pdf/ev-poppler.cc:
+
+ Bump poppler requirement to 0.8.0.
+
2008-04-08 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
* NEWS:
diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index c11d212..01c9a69 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -49,18 +49,10 @@
#include "ev-attachment.h"
#include "ev-image.h"
-#if (defined (HAVE_POPPLER_PAGE_RENDER) || defined (HAVE_POPPLER_PAGE_RENDER_FOR_PRINTING)) && (defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS))
+#if (defined (HAVE_POPPLER_PAGE_RENDER)) && (defined (HAVE_CAIRO_PDF) || defined (HAVE_CAIRO_PS))
#define HAVE_CAIRO_PRINT
#endif
-#if POPPLER_MAJOR_VERSION <= 6 || (POPPLER_MAJOR_VERSION == 7 && POPPLER_MINOR_VERSION < 2)
-#define POPPLER_HAS_GDK
-#else
-#ifdef POPPLER_WITH_GDK
-#define POPPLER_HAS_GDK
-#endif
-#endif
-
typedef struct {
PdfDocument *document;
char *text;
@@ -960,6 +952,8 @@ ev_link_from_action (PdfDocument *pdf_document,
const char *unimplemented_action = NULL;
switch (action->type) {
+ case POPPLER_ACTION_NONE:
+ break;
case POPPLER_ACTION_GOTO_DEST: {
EvLinkDest *dest;
@@ -1197,11 +1191,8 @@ pdf_document_images_get_image_mapping (EvDocumentImages *document_images,
image_mapping = (PopplerImageMapping *)list->data;
ev_image_mapping = g_new (EvImageMapping, 1);
-#ifdef HAVE_POPPLER_PAGE_GET_IMAGE
+
ev_image_mapping->image = ev_image_new (page, image_mapping->image_id);
-#elif POPPLER_HAS_CAIRO
- ev_image_mapping->image = ev_image_new_from_pixbuf (image_mapping->image);
-#endif
ev_image_mapping->x1 = image_mapping->area.x1;
ev_image_mapping->x2 = image_mapping->area.x2;
ev_image_mapping->y1 = image_mapping->area.y1;
@@ -1261,7 +1252,7 @@ make_thumbnail_for_page (PdfDocument *pdf_document,
pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document),
rc, &width, &height);
-#ifdef POPPLER_HAS_GDK
+#ifdef POPPLER_WITH_GDK
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
width, height);
gdk_pixbuf_fill (pixbuf, 0xffffffff);
@@ -1280,7 +1271,7 @@ make_thumbnail_for_page (PdfDocument *pdf_document,
pixbuf = ev_document_misc_pixbuf_from_surface (surface);
cairo_surface_destroy (surface);
-#endif /* POPPLER_HAS_GDK */
+#endif /* POPPLER_WITH_GDK */
return pixbuf;
}
@@ -1300,10 +1291,7 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
g_return_val_if_fail (poppler_page != NULL, NULL);
-#if POPPLER_MAJOR_VERSION <= 6 || (POPPLER_MAJOR_VERSION == 7 && POPPLER_MINOR_VERSION < 2)
- pixbuf = poppler_page_get_thumbnail (poppler_page);
-#else
-#ifdef POPPLER_HAS_GDK
+#ifdef POPPLER_WITH_GDK
pixbuf = poppler_page_get_thumbnail_pixbuf (poppler_page);
#else
cairo_surface_t *surface;
@@ -1313,8 +1301,8 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails
pixbuf = ev_document_misc_pixbuf_from_surface (surface);
cairo_surface_destroy (surface);
}
-#endif
-#endif
+#endif /* POPPLER_WITH_GDK */
+
if (pixbuf) {
/* Rotate provided thumbnail if needed */
@@ -1798,13 +1786,7 @@ pdf_document_file_exporter_do_page (EvFileExporter *exporter,
y * (rotate ? pwidth : pheight));
cairo_scale (ctx->cr, xscale, yscale);
-#ifdef HAVE_POPPLER_PAGE_RENDER_FOR_PRINTING
poppler_page_render_for_printing (poppler_page, ctx->cr);
-#else
-#ifdef HAVE_POPPLER_PAGE_RENDER
- poppler_page_render (poppler_page, ctx->cr);
-#endif
-#endif
ctx->pages_printed++;
@@ -1899,13 +1881,6 @@ pdf_selection_render_selection (EvSelection *selection,
#ifdef HAVE_POPPLER_PAGE_RENDER
cairo_t *cr;
-
-#if POPPLER_MAJOR_VERSION <= 6 || (POPPLER_MAJOR_VERSION == 7 && POPPLER_MINOR_VERSION < 2)
- GdkColor text_color, base_color;
-
- text_color = *text;
- base_color = *base;
-#else
PopplerColor text_color, base_color;
text_color.red = text->red;
@@ -1915,7 +1890,6 @@ pdf_selection_render_selection (EvSelection *selection,
base_color.red = base->red;
base_color.green = base->green;
base_color.blue = base->blue;
-#endif
if (*surface == NULL) {
*surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
@@ -2022,26 +1996,18 @@ pdf_selection_get_selection_region (EvSelection *selection,
{
PdfDocument *pdf_document;
GdkRegion *retval;
+ GList *region;
pdf_document = PDF_DOCUMENT (selection);
set_rc_data (pdf_document, rc);
-#if POPPLER_MAJOR_VERSION <= 6 || (POPPLER_MAJOR_VERSION == 7 && POPPLER_MINOR_VERSION < 2)
- retval = poppler_page_get_selection_region (POPPLER_PAGE (rc->data),
- rc->scale,
- (PopplerSelectionStyle)style,
- (PopplerRectangle *) points);
-#else
- GList *region;
-
region = poppler_page_get_selection_region (POPPLER_PAGE (rc->data),
rc->scale,
(PopplerSelectionStyle)style,
(PopplerRectangle *) points);
retval = create_gdk_region_from_poppler_region (region);
g_list_free (region);
-#endif
return retval;
}
@@ -2064,17 +2030,11 @@ pdf_selection_get_selection_map (EvSelection *selection,
points.y1 = 0.0;
poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));
-#if POPPLER_MAJOR_VERSION <= 6 || (POPPLER_MAJOR_VERSION == 7 && POPPLER_MINOR_VERSION < 2)
- retval = poppler_page_get_selection_region (poppler_page, 1.0,
- POPPLER_SELECTION_GLYPH,
- &points);
-#else
region = poppler_page_get_selection_region (poppler_page, 1.0,
POPPLER_SELECTION_GLYPH,
&points);
retval = create_gdk_region_from_poppler_region (region);
g_list_free (region);
-#endif
g_object_unref (poppler_page);
return retval;
diff --git a/configure.ac b/configure.ac
index 6afc872..2b5bca1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,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.6
+ POPPLER_REQUIRED=0.8.0
PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED,enable_pdf=yes,enable_pdf=no)
if test "x$enable_pdf" = "xyes"; then
@@ -220,20 +220,8 @@ if test "x$enable_pdf" = "xyes"; then
evince_save_LIBS=$LIBS
LIBS="$LIBS $POPPLER_LIBS"
AC_CHECK_FUNCS(poppler_page_render)
- AC_CHECK_FUNCS(poppler_page_render_for_printing)
- AC_CHECK_FUNCS(poppler_page_get_image)
LIBS=$evince_save_LIBS
- poppler_version=`$PKG_CONFIG --modversion poppler-glib`
- if test x$poppler_version = x0.6; then
- poppler_version=0.6.0
- fi
- POPPLER_MAJOR_VERSION=`echo $poppler_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2 /'`
- POPPLER_MINOR_VERSION=`echo $poppler_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3 /'`
-
- AC_DEFINE_UNQUOTED([POPPLER_MAJOR_VERSION], $POPPLER_MAJOR_VERSION, [Poppler major version number])
- AC_DEFINE_UNQUOTED([POPPLER_MINOR_VERSION], $POPPLER_MINOR_VERSION, [Poppler minor version number])
-
PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
if test x$enable_cairo_pdf = xyes; then
AC_DEFINE([HAVE_CAIRO_PDF], [1], [defined if cairo-pdf is available])
generated by cgit v0.9.1 at 2024-04-19 23:03:45 (GMT)