]>
Commit | Line | Data |
---|---|---|
7dbe6771 JB |
1 | From e831b034746f8dc3c3c1b88372751f6dcb974831 Mon Sep 17 00:00:00 2001 |
2 | From: Marc Jeanmougin <marc@jeanmougin.fr> | |
3 | Date: Wed, 24 Apr 2019 14:11:26 +0200 | |
4 | Subject: [PATCH] Tentative fix for poppler 0.76 | |
5 | ||
6 | --- | |
7 | src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- | |
8 | src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++ | |
9 | 2 files changed, 8 insertions(+), 1 deletion(-) | |
10 | ||
11 | diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp | |
12 | index 8484984bdf..4f798e35bf 100644 | |
13 | --- a/src/extension/internal/pdfinput/pdf-parser.cpp | |
14 | +++ b/src/extension/internal/pdfinput/pdf-parser.cpp | |
15 | @@ -421,7 +421,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { | |
16 | error(errInternal, -1, "Weird page contents"); | |
17 | return; | |
18 | } | |
19 | - parser = new Parser(xref, new Lexer(xref, obj), gFalse); | |
20 | + parser = new _POPPLER_NEW_PARSER(xref, obj); | |
21 | go(topLevel); | |
22 | delete parser; | |
23 | parser = nullptr; | |
24 | diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h | |
25 | index 61a15083a0..5e8bc4ae90 100644 | |
26 | --- a/src/extension/internal/pdfinput/poppler-transition-api.h | |
27 | +++ b/src/extension/internal/pdfinput/poppler-transition-api.h | |
28 | @@ -14,6 +14,13 @@ | |
29 | ||
30 | #include <glib/poppler-features.h> | |
31 | ||
32 | +#if POPPLER_CHECK_VERSION(0, 76, 0) | |
33 | +#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) | |
34 | +#else | |
35 | +#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) | |
36 | +#endif | |
37 | + | |
38 | + | |
39 | #if POPPLER_CHECK_VERSION(0, 72, 0) | |
40 | #define getCString c_str | |
41 | #endif | |
42 | -- | |
43 | 2.22.0 | |
44 |