Kaydet (Commit) 8ff41a26 authored tarafından Aleksei Nikiforov's avatar Aleksei Nikiforov Kaydeden (comit) Stephan Bergmann

Fix build with poppler 0.71

Change-Id: I470ece9dc4766e10e1ccb5e99b25a8d8cc4cbf38
Reviewed-on: https://gerrit.libreoffice.org/63860
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 3d9c00ce
...@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*) ...@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
printf( "restoreState\n" ); printf( "restoreState\n" );
} }
#if POPPLER_CHECK_VERSION(0, 71, 0)
void PDFOutDev::setDefaultCTM(const double *pMat)
#else
void PDFOutDev::setDefaultCTM(double *pMat) void PDFOutDev::setDefaultCTM(double *pMat)
#endif
{ {
assert(pMat); assert(pMat);
......
...@@ -173,7 +173,11 @@ namespace pdfi ...@@ -173,7 +173,11 @@ namespace pdfi
//----- initialization and control //----- initialization and control
// Set default transform matrix. // Set default transform matrix.
#if POPPLER_CHECK_VERSION(0, 71, 0)
virtual void setDefaultCTM(const double *ctm) override;
#else
virtual void setDefaultCTM(double *ctm) override; virtual void setDefaultCTM(double *ctm) override;
#endif
// Start a page. // Start a page.
virtual void startPage(int pageNum, GfxState *state virtual void startPage(int pageNum, GfxState *state
......
...@@ -69,7 +69,7 @@ int main(int argc, char **argv) ...@@ -69,7 +69,7 @@ int main(int argc, char **argv)
// read config file // read config file
globalParams = new GlobalParams(); globalParams = new GlobalParams();
globalParams->setErrQuiet(gTrue); globalParams->setErrQuiet(true);
#if defined(_MSC_VER) #if defined(_MSC_VER)
globalParams->setupBaseFonts(nullptr); globalParams->setupBaseFonts(nullptr);
#endif #endif
...@@ -145,7 +145,7 @@ int main(int argc, char **argv) ...@@ -145,7 +145,7 @@ int main(int argc, char **argv)
i, i,
PDFI_OUTDEV_RESOLUTION, PDFI_OUTDEV_RESOLUTION,
PDFI_OUTDEV_RESOLUTION, PDFI_OUTDEV_RESOLUTION,
0, gTrue, gTrue, gTrue); 0, true, true, true);
rDoc.processLinks(&aOutDev, i); rDoc.processLinks(&aOutDev, i);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment