summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/pdfinput/pdf-input.cpp
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-09-06 13:05:31 +0000
committerEduard Braun <eduard.braun2@gmx.de>2017-09-07 17:07:58 +0000
commit9418824967eb4c53371ef8588243fed4cab496e0 (patch)
tree87a58d91f365f4e70ec7ae2c2523c633e7472d15 /src/extension/internal/pdfinput/pdf-input.cpp
parentFix infinite loop when rendering text inside a shape under very special condi... (diff)
downloadinkscape-9418824967eb4c53371ef8588243fed4cab496e0.tar.gz
inkscape-9418824967eb4c53371ef8588243fed4cab496e0.zip
adapt to poppler 0.58
Diffstat (limited to 'src/extension/internal/pdfinput/pdf-input.cpp')
-rw-r--r--src/extension/internal/pdfinput/pdf-input.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 844d16c17..6e0ee75aa 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -846,14 +846,20 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
}
// Parse the document structure
+#if defined(POPPLER_NEW_OBJECT_API)
+ Object obj = page->getContents();
+#else
Object obj;
page->getContents(&obj);
+#endif
if (!obj.isNull()) {
pdf_parser->parse(&obj);
}
// Cleanup
+#if !defined(POPPLER_NEW_OBJECT_API)
obj.free();
+#endif
delete pdf_parser;
delete builder;
g_free(docname);