poppler-0.83.patch

   1 From 035830400393e075fca364a444e04c40516730b2 Mon Sep 17 00:00:00 2001
   2 From: Martin Milata <martin@martinmilata.cz>
   3 Date: Wed, 4 Dec 2019 02:37:40 +0100
   4 Subject: [PATCH] Fix build with poppler-0.83
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9
  10 Reviewed-on: https://gerrit.libreoffice.org/84384
  11 Tested-by: Jenkins
  12 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
  13 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86905
  14 Reviewed-by: Tomáš Chvátal <tchvatal@suse.com>
  15 Tested-by: Tomáš Chvátal <tchvatal@suse.com>
  16 ---
  17  sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++
  18  sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
  19  sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx    | 4 ++++
  20  3 files changed, 15 insertions(+)
  21
  22 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
  23 index 26048177e87d..e9c2a407c279 100644
  24 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
  25 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
  26 @@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
  27      gfree(pBuf);
  28  }
  29
  30 +#if POPPLER_CHECK_VERSION(0, 83, 0)
  31 +void PDFOutDev::printPath( const GfxPath* pPath )
  32 +#else
  33  void PDFOutDev::printPath( GfxPath* pPath )
  34 +#endif
  35  {
  36      int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
  37      for( int i=0; i<nSubPaths; i++ )
  38      {
  39 +#if POPPLER_CHECK_VERSION(0, 83, 0)
  40 +        const
  41 +#endif
  42          GfxSubpath* pSub  = pPath->getSubpath( i );
  43          const int nPoints = pSub->getNumPoints();
  44
  45 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
  46 index 02f6b59f6f15..2e7d2186f9a1 100644
  47 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
  48 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
  49 @@ -149,7 +149,11 @@ namespace pdfi
  50
  51          int  parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
  52          void writeFontFile( GfxFont* gfxFont ) const;
  53 +#if POPPLER_CHECK_VERSION(0, 83, 0)
  54 +        static void printPath( const GfxPath* pPath );
  55 +#else
  56          static void printPath( GfxPath* pPath );
  57 +#endif
  58
  59      public:
  60          explicit PDFOutDev( PDFDoc* pDoc );
  61 diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
  62 index 42178b650cdd..b1a54bd09c5f 100644
  63 --- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
  64 +++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
  65 @@ -68,7 +68,11 @@ int main(int argc, char **argv)
  66      }
  67
  68      // read config file
  69 +#if POPPLER_CHECK_VERSION(0, 83, 0)
  70 +    globalParams = std::make_unique<GlobalParams>();
  71 +#else
  72      globalParams = new GlobalParams();
  73 +#endif
  74      globalParams->setErrQuiet(true);
  75  #if defined(_MSC_VER)
  76      globalParams->setupBaseFonts(nullptr);
  77 --
  78 2.24.1
  79