diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-04-24 12:11:26 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-04-24 12:11:26 +0000 |
| commit | e831b034746f8dc3c3c1b88372751f6dcb974831 (patch) | |
| tree | 563d903f7417b7afe0f8daf5b3cf8d2b2345bc18 /src/extension/internal/pdfinput | |
| parent | Fix center alignment errors in flowed text due to white space between element... (diff) | |
| download | inkscape-e831b034746f8dc3c3c1b88372751f6dcb974831.tar.gz inkscape-e831b034746f8dc3c3c1b88372751f6dcb974831.zip | |
Tentative fix for poppler 0.76
Diffstat (limited to 'src/extension/internal/pdfinput')
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-parser.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/poppler-transition-api.h | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp index 8484984bd..4f798e35b 100644 --- a/src/extension/internal/pdfinput/pdf-parser.cpp +++ b/src/extension/internal/pdfinput/pdf-parser.cpp @@ -421,7 +421,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { error(errInternal, -1, "Weird page contents"); return; } - parser = new Parser(xref, new Lexer(xref, obj), gFalse); + parser = new _POPPLER_NEW_PARSER(xref, obj); go(topLevel); delete parser; parser = nullptr; diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h index 61a15083a..5e8bc4ae9 100644 --- a/src/extension/internal/pdfinput/poppler-transition-api.h +++ b/src/extension/internal/pdfinput/poppler-transition-api.h @@ -14,6 +14,13 @@ #include <glib/poppler-features.h> +#if POPPLER_CHECK_VERSION(0, 76, 0) +#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) +#else +#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) +#endif + + #if POPPLER_CHECK_VERSION(0, 72, 0) #define getCString c_str #endif |