fix build with poppler 0.64
GooString became const... Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5
This commit is contained in:
@@ -432,6 +432,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 )
|
||||
{
|
||||
@@ -728,6 +731,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 = static_cast<long long>(pID->gen) << 32 | static_cast<long long>(pID->num);
|
||||
@@ -918,7 +924,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
|
||||
}
|
||||
|
@@ -224,7 +224,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
|
||||
|
Reference in New Issue
Block a user