mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From a5a188d5bbb99f6e305dad6f81b9e3760aa32676 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Sturmlechner <asturm@gentoo.org>
|
|
Date: Tue, 8 Jan 2019 11:24:40 +0100
|
|
Subject: Fix build with poppler-0.72
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134
|
|
Reviewed-on: https://gerrit.libreoffice.org/65960
|
|
Tested-by: Jenkins
|
|
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
|
(cherry picked from commit 65a6c9ae4791188ffcecf489073cf38873ce5e17)
|
|
Reviewed-on: https://gerrit.libreoffice.org/66376
|
|
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
---
|
|
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
index df0288d..9c65fc2 100644
|
|
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*)
|
|
LinkAction* pAction = link->getAction();
|
|
if (pAction && pAction->getKind() == actionURI)
|
|
{
|
|
+#if POPPLER_CHECK_VERSION(0, 72, 0)
|
|
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
|
|
+#else
|
|
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
|
|
+#endif
|
|
|
|
std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
|
|
|
|
@@ -757,7 +761,11 @@ void PDFOutDev::updateFont(GfxState *state)
|
|
|
|
aFont = it->second;
|
|
|
|
+#if POPPLER_CHECK_VERSION(0, 72, 0)
|
|
+ std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
|
|
+#else
|
|
std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
|
|
+#endif
|
|
printf( " %d %d %d %d %f %d %s",
|
|
aFont.isEmbedded,
|
|
aFont.isBold,
|
|
--
|
|
cgit v1.1
|
|
|