Commit | Line | Data |
---|---|---|
1a753d56 MB |
1 | This patch adds support for Poppler 0.76 and later. |
2 | ||
3 | Taken from upstream: | |
4 | <https://gitlab.com/inkscape/inkscape/commit/e831b034746f8dc3c3c1b88372751f6dcb974831> | |
5 | ||
6 | diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp | |
7 | index 8484984bdf..4f798e35bf 100644 | |
8 | --- a/src/extension/internal/pdfinput/pdf-parser.cpp | |
9 | +++ b/src/extension/internal/pdfinput/pdf-parser.cpp | |
10 | @@ -421,7 +421,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { | |
11 | error(errInternal, -1, "Weird page contents"); | |
12 | return; | |
13 | } | |
14 | - parser = new Parser(xref, new Lexer(xref, obj), gFalse); | |
15 | + parser = new _POPPLER_NEW_PARSER(xref, obj); | |
16 | go(topLevel); | |
17 | delete parser; | |
18 | parser = nullptr; | |
19 | diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h | |
20 | index 61a15083a0..5e8bc4ae90 100644 | |
21 | --- a/src/extension/internal/pdfinput/poppler-transition-api.h | |
22 | +++ b/src/extension/internal/pdfinput/poppler-transition-api.h | |
23 | @@ -14,6 +14,13 @@ | |
24 | ||
25 | #include <glib/poppler-features.h> | |
26 | ||
27 | +#if POPPLER_CHECK_VERSION(0, 76, 0) | |
28 | +#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) | |
29 | +#else | |
30 | +#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) | |
31 | +#endif | |
32 | + | |
33 | + | |
34 | #if POPPLER_CHECK_VERSION(0, 72, 0) | |
35 | #define getCString c_str | |
36 | #endif |