ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Fix build with poppler-0.83

Browse Source 
Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9
Reviewed-on: https://gerrit.libreoffice.org/84384
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
This commit is contained in:
Martin Milata
2019-12-04 11:43:12 +01:00
committed by Michael Stahl
parent 2c56d8ce71
commit 9065cd8d9a
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+7
View File
@@ -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();
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+4
View File
@@ -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 );
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+4
View File
@@ -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);