diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:34:50 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:34:50 +0200 |
| commit | 51cfa236bf238ad24ee7d072d2b8712d7e9c8ff9 (patch) | |
| tree | eeb5d5a3b107bd993ee1e9732a1d2417d34bc60e /sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | |
| parent | 7685aa6025b7cdfbcfc52a706252356e03ef0e07 (diff) | |
| parent | f6f8f67460bba296c49f794d14621b7313df4f7d (diff) | |
Merge branch 'master' into feature/gnumake4
Diffstat (limited to 'sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx')
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 |
1 files changed, 7 insertions, 0 deletions
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); |