File 0007-Tentative-fix-for-poppler-0.76.patch of Package inkscape.13173

Overview Repositories Revisions Requests Users Attributes Meta

File 0007-Tentative-fix-for-poppler-0.76.patch of Package inkscape.13173

From e831b034746f8dc3c3c1b88372751f6dcb974831 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Wed, 24 Apr 2019 14:11:26 +0200
Subject: [PATCH] Tentative fix for poppler 0.76

---
 src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
 src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 8484984bdf..4f798e35bf 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 = NULL;
#diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
#index 61a15083a0..5e8bc4ae90 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
diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
index 8484984bdf..4f798e35bf 100644
--- a/src/extension/internal/pdfinput/pdf-parser.h
+++ b/src/extension/internal/pdfinput/pdf-parser.h
@@ -322,6 +322,11 @@
   void pushResources(Dict *resDict);
   void popResources();
 };
+#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
 
 #endif /* HAVE_POPPLER */
 
-- 
2.22.0

Places

File 0007-Tentative-fix-for-poppler-0.76.patch of Package inkscape.13173

Places