davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c5f689a1542ee2699290641cb9ce7d3695a4fd9c
commit c5f689a1542ee2699290641cb9ce7d3695a4fd9c
Author: Dave Andreoli <d...@gurumeditation.it>
Date: Thu Jun 9 12:33:10 2016 +0200
Simplify and fix poppler discovery code
Now configure should abort in case poppler is not found (unless explicitly
disabled)
I'm still not sure about the hard "poppler < 0.40" requirement
added by jpeg yesterday, we should fix the issue instead of
tell "we don't support it"
---
configure.ac | 35 ++++++-----------------------------
src/generic/evas/pdf/main.cpp | 4 ++--
2 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/configure.ac b/configure.ac
index b6616f3..43ceb4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2862,37 +2862,14 @@ have_rsvg="no"
### Check needed dependency for each generic loader
if test "x${want_poppler}" = "xyes"; then
- PKG_CHECK_EXISTS([poppler >= 0.12 poppler < 0.20],
- [
- poppler_pc="poppler >= 0.12 poppler < 0.20"
- have_poppler="yes"
- ],
- [have_poppler="no"])
-
- if test "x${have_poppler}" = "xno" ; then
- PKG_CHECK_EXISTS([poppler >= 0.20 poppler < 0.31],
- [
- poppler_pc="poppler >= 0.20 poppler < 0.31"
- AC_DEFINE(HAVE_POPPLER_020, 1, [Have poppler 0.20])
- have_poppler="yes"
- ],
- [have_poppler="no"])
- fi
+ PKG_CHECK_MODULES([POPPLER], [poppler >= 0.12 poppler < 0.40],
+ [have_poppler="yes"])
- if test "x${have_poppler}" = "xno" ; then
- PKG_CHECK_EXISTS([poppler >= 0.31 poppler < 0.40],
- [
- poppler_pc="poppler >= 0.31"
- AC_DEFINE(HAVE_POPPLER_031, 1, [Have poppler 0.31])
- have_poppler="yes"
- ],
- [have_poppler="no"])
- fi
+ PKG_CHECK_EXISTS([poppler >= 0.20],
+ [AC_DEFINE(HAVE_POPPLER_020, 1, [Have poppler at least
0.20])])
- if test "x${have_poppler}" = "xyes" ; then
- PKG_CHECK_MODULES([POPPLER], [${poppler_pc}],
- [have_poppler="yes"])
- fi
+ PKG_CHECK_EXISTS([poppler >= 0.31],
+ [AC_DEFINE(HAVE_POPPLER_031, 1, [Have poppler at least
0.31])])
fi
if test "x${want_spectre}" = "xyes"; then
diff --git a/src/generic/evas/pdf/main.cpp b/src/generic/evas/pdf/main.cpp
index 6b1de13..d9af1d3 100644
--- a/src/generic/evas/pdf/main.cpp
+++ b/src/generic/evas/pdf/main.cpp
@@ -161,7 +161,7 @@ void poppler_load_image(int size_w EINA_UNUSED, int size_h
EINA_UNUSED)
if (!output_dev)
return;
-#if defined(HAVE_POPPLER_020) || defined(HAVE_POPPLER_031)
+#ifdef HAVE_POPPLER_020
output_dev->startDoc(pdfdoc);
#else
output_dev->startDoc(pdfdoc->getXRef());
@@ -174,7 +174,7 @@ void poppler_load_image(int size_w EINA_UNUSED, int size_h
EINA_UNUSED)
output_dev->setVectorAntialias(EINA_TRUE);
#endif
-#if defined(HAVE_POPPLER_020) || defined(HAVE_POPPLER_031)
+#ifdef HAVE_POPPLER_020
page->displaySlice(output_dev, dpi, dpi,
0, false, false,
0, 0, width, height,
--
