[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 2 commits - sdext/source

[Martin Whitaker (via logerrit)]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |   11 ++++++++++-
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |    4 ++++
 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx    |    4 ++++
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit cc6d7cabda7a93dc6324b3d74bd601c15ff1758c
Author:     Martin Whitaker <foss at martin-whitaker.me.uk>
AuthorDate: Fri May 8 21:47:25 2020 +0200
Commit:     Vasily Melenchuk <vasily.melenchuk at cib.de>
CommitDate: Mon Apr 5 17:16:57 2021 +0300

    tdf#131353: Fix build with poppler 0.86.0
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93789
    Tested-by: René Engelhard <rene at debian.org>
    Tested-by: Jenkins
    Reviewed-by: Tomáš Chvátal <tchvatal at suse.com>
    (cherry picked from commit b42ab78fb871924896b3cc38a7b2f1257151f711)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96639
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit d40f36bf47814c324a1ec467c566255fb187444b)
    
    Change-Id: I89b4635a6a3e3a5522172d6f4c3f14e6c14994b1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108955
    Tested-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index da8ded874aa5..58ed91529a22 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -562,7 +562,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
     LinkAction* pAction = link->getAction();
     if (pAction && pAction->getKind() == actionURI)
     {
-#if POPPLER_CHECK_VERSION(0, 72, 0)
+#if POPPLER_CHECK_VERSION(0, 86, 0)
+    const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
+#elif 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();
commit 64c195b0414a343c864812f8ebb4f7f5c077a9ee
Author:     Martin Milata <martin at martinmilata.cz>
AuthorDate: Wed Dec 4 02:37:40 2019 +0100
Commit:     Vasily Melenchuk <vasily.melenchuk at cib.de>
CommitDate: Mon Apr 5 17:16:41 2021 +0300

    Fix build with poppler-0.83
    
    Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9
    Reviewed-on: https://gerrit.libreoffice.org/84384
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86905
    Reviewed-by: Tomáš Chvátal <tchvatal at suse.com>
    Tested-by: Tomáš Chvátal <tchvatal at suse.com>
    (cherry picked from commit 035830400393e075fca364a444e04c40516730b2)

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 410e5ad657b7..da8ded874aa5 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
     gfree(pBuf);
 }
 
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+void PDFOutDev::printPath( const GfxPath* pPath )
+#else
 void PDFOutDev::printPath( GfxPath* pPath )
+#endif
 {
     int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
     for( int i=0; i<nSubPaths; i++ )
     {
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+        const
+#endif
         GfxSubpath* pSub  = pPath->getSubpath( i );
         const int nPoints = pSub->getNumPoints();
 
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index d2e2f18e9d62..b240ab42c479 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -149,7 +149,11 @@ namespace pdfi
 
         int  parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
         void writeFontFile( GfxFont* gfxFont ) const;
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+        static void printPath( const GfxPath* pPath );
+#else
         static void printPath( GfxPath* pPath );
+#endif
 
     public:
         explicit PDFOutDev( PDFDoc* pDoc );
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index b0a6ac41ba94..48f46961f07e 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -68,7 +68,11 @@ int main(int argc, char **argv)
     }
 
     // read config file
+#if POPPLER_CHECK_VERSION(0, 83, 0)
+    globalParams = std::make_unique<GlobalParams>();
+#else
     globalParams = new GlobalParams();
+#endif
     globalParams->setErrQuiet(true);
 #if defined(_MSC_VER)
     globalParams->setupBaseFonts(nullptr);