summaryrefslogtreecommitdiff
path: root/src/generic
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2016-06-09 12:33:10 +0200
committerDave Andreoli <dave@gurumeditation.it>2016-06-09 12:33:10 +0200
commitc5f689a1542ee2699290641cb9ce7d3695a4fd9c (patch)
tree28ba201a121c5d43f96e28e82e83d492392e309a /src/generic
parent8ce859f484a1669bb12621e84ebc9c67edba6769 (diff)
downloadefl-c5f689a1542ee2699290641cb9ce7d3695a4fd9c.tar.gz
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"
Diffstat (limited to 'src/generic')
-rw-r--r--src/generic/evas/pdf/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/generic/evas/pdf/main.cpp b/src/generic/evas/pdf/main.cpp
index 6b1de13ce0..d9af1d342b 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,