From 106b2c96e9807af14d6eb6e8f83dcf25095a093e Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Tue, 24 Apr 2018 15:56:23 +0200 Subject: fix build with poppler 0.64 GooString became const... Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5 Reviewed-on: https://gerrit.libreoffice.org/53422 Tested-by: Jenkins Reviewed-by: Michael Stahl --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 00fd56a..9618e5b 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -446,6 +446,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 ) { @@ -742,6 +745,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; @@ -932,7 +938,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 922c513..2a6268c 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 -- cgit v1.1