diff options
| author | Rene Engelhard <rene@debian.org> | 2018-04-24 15:56:23 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-10 16:16:45 +0200 |
| commit | 09179598994cab8f876ff30873a9ef2b02c69349 (patch) | |
| tree | 6a4d028dd7dfcf1b4f1b381408f9ff18a0ff770a | |
| parent | 05645e8a9bf90999c7010e75000a7529c91d06f2 (diff) | |
fix build with poppler 0.64
GooString became const...
Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5
Reviewed-on: https://gerrit.libreoffice.org/53422
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 106b2c96e9807af14d6eb6e8f83dcf25095a093e)
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index b3f524957cd1..dd26f2da3961 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -451,6 +451,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) FontAttributes aNewFont; int nSize = 0; +#if POPPLER_CHECK_VERSION(0, 64, 0) + const +#endif GooString* pFamily = gfxFont->getName(); if( pFamily ) { @@ -747,6 +750,9 @@ void PDFOutDev::updateFont(GfxState *state) FontAttributes aFont; int nEmbedSize=0; +#if POPPLER_CHECK_VERSION(0, 64, 0) + const +#endif Ref* pID = gfxFont->getID(); // TODO(Q3): Portability problem long long fontID = (long long)pID->gen << 32 | (long long)pID->num; @@ -937,7 +943,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, printf( "\n" ); } +#if POPPLER_CHECK_VERSION(0, 64, 0) +void PDFOutDev::drawString(GfxState*, const GooString* /*s*/) +#else void PDFOutDev::drawString(GfxState*, GooString* /*s*/) +#endif { // TODO(F3): NYI } diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index f6d6fa41ddcb..1ffe4207b1ee 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -223,7 +223,11 @@ namespace pdfi double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen) override; +#if POPPLER_CHECK_VERSION(0, 64, 0) + virtual void drawString(GfxState *state, const GooString *s) override; +#else virtual void drawString(GfxState *state, GooString *s) override; +#endif virtual void endTextObject(GfxState *state) override; //----- image drawing |