[tracker/tracker-0.8] tracker-extract: Fix build for poppler-glib > 0.14
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/tracker-0.8] tracker-extract: Fix build for poppler-glib > 0.14
- Date: Wed, 27 Apr 2011 09:41:35 +0000 (UTC)
commit a5c27432813d1bd00fb71a712a78840d621cdefc
Author: Martyn Russell <martyn lanedo com>
Date: Wed Apr 27 10:23:45 2011 +0100
tracker-extract: Fix build for poppler-glib > 0.14
configure.ac | 3 +++
src/tracker-extract/tracker-extract-pdf.c | 6 ++++++
2 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4f1ebc4..dbe5a5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1158,6 +1158,9 @@ if test "x$enable_poppler_glib" != "xno" ; then
AC_SUBST(POPPLER_GLIB_CFLAGS)
AC_SUBST(POPPLER_GLIB_LIBS)
+ PKG_CHECK_EXISTS([poppler-glib <= 0.14],
+ [AC_DEFINE(HAVE_POPPLER_GLIB_0_14, 1, [Define if we have poppler-glib 0.14 or older])])
+
if test "x$have_poppler_glib" = "xyes"; then
AC_DEFINE(HAVE_POPPLER_GLIB, [], [Define if we have poppler-glib])
fi
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index 6dbdba9..7590688 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -243,7 +243,13 @@ extract_content (PopplerDocument *document,
rect.x1 = rect.y1 = 0;
poppler_page_get_size (page, &rect.x2, &rect.y2);
+
+#ifdef HAVE_POPPLER_GLIB_0_14
text = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
+#else
+ text = poppler_page_get_text (page);
+#endif
+
t = tracker_text_normalize (text, n_words - words, &normalized_words);
words += normalized_words;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]