Changeset 286

Timestamp:

10/08/07 07:52:56 (12 months ago)

Author:

jordi

Message:

Based on a patch sent by Alex Dedul it is not possible to compile ePDFView with poppler version 0.6.0.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/PDFDocument.cxx (modified) (2 diffs)

trunk/configure.ac

@@ -45 +45 @@
     AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
 fi
+PKG_CHECK_EXISTS([poppler-glib >= 0.6.0], [have_poppler_060=yes])
+if test "x$have_poppler_060" = "xyes"; then
+        AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
+fi
 
 EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])

trunk/src/PDFDocument.cxx

@@ -686 +686 @@
     repairEmpty(textRect);
 
+#if defined (HAVE_POPPLER_0_6_0)
+    gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH,
+            &textRect);
+#else // !HAVE_POPPLER_0_6_0
     gchar *text = poppler_page_get_text(page, &textRect);
+#endif // HAVE_POPPLER_0_6_0
     if(!text)
         goto cleanup;
@@ -722 +727 @@
 
     //calc selection size
+#if defined (HAVE_POPPLER_0_6_0)
+    res = poppler_page_get_selection_region(page, getZoom(),
+            POPPLER_SELECTION_GLYPH, &rect);
+#else // !HAVE_POPPLER_0_6_0
     res = poppler_page_get_selection_region(page, getZoom(), &rect);
+#endif // HAVE_POPPLER_0_6_0
                              
     //free some local data