diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-19 08:54:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-19 08:54:07 +0100 |
| commit | f6f8f67460bba296c49f794d14621b7313df4f7d (patch) | |
| tree | 304b8bf2b0ea745d7faabd719417f441d393d56e /sdext | |
| parent | 33c4a94bdfd9cbf8ebd61c0320d7cc9a67676200 (diff) | |
poppler 0.17.0 changed its api for no some reason or other
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 5868b6be9825..cf28922d2e7d 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -489,7 +489,11 @@ void PDFOutDev::endPage() printf("endPage\n"); } +#if POPPLER_CHECK_VERSION(0, 17, 0) +void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog) +#else void PDFOutDev::processLink(Link* link, Catalog*) +#endif { assert(link); diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 5b672068c997..2a35fb7faaae 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -65,7 +65,10 @@ class GfxPath; class GfxFont; class PDFDoc; #ifndef SYSTEM_POPPLER +#define POPPLER_CHECK_VERSION(major,minor,micro) (0) typedef GString GooString; +#else +#include <glib/poppler-features.h> #endif namespace pdfi @@ -194,8 +197,12 @@ namespace pdfi // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); + #if POPPLER_CHECK_VERSION(0, 17, 0) + virtual void processLink(AnnotLink *link, Catalog *catalog); + #else //----- link borders virtual void processLink(Link *link, Catalog *catalog); + #endif //----- save/restore graphics state virtual void saveState(GfxState *state); |