[Libreoffice-commits] core.git: sdext/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Aug 20 09:12:33 UTC 2021
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit fc7fbbd8ba089570c93917eedf1de0512cc0ba3b
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 20 08:47:23 2021 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 20 11:11:57 2021 +0200
allow build with poppler <= 0.82
Change-Id: Ia062a788fec9c67c18382c2ff5f4b4df35bd17d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120771
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 54caf6728133..74740233d467 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -458,7 +458,11 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st
aNewFont.isBold = gfxFont->isBold();
aNewFont.isItalic = gfxFont->isItalic();
+#if POPPLER_CHECK_VERSION(0, 83, 0) // const added to getTransformedFontSize
aNewFont.size = state->getTransformedFontSize();
+#else
+ aNewFont.size = const_cast<GfxState*>(state)->getTransformedFontSize();
+#endif
aNewFont.isUnderline = false;
if( gfxFont->getType() == fontTrueType || gfxFont->getType() == fontType1 )
More information about the Libreoffice-commits
mailing list