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 | 04f358b2cc68d6a164c5273e88fe82440389758c (patch) | |
tree | 9c93f05bed3ff1c88e56f3480ff1afbe852f0df3 | |
parent | 27f20412f121d85937ccae81fdb50e8b2e440052 (diff) |
poppler 0.17.0 changed its api for no some reason or otherfeature/layout
-rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 | ||||
-rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index f7741b4..5022dd5 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 3ac0f49..0fd43c5 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 @@ -193,9 +196,13 @@ namespace pdfi // Convert between device and user coordinates. // 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); |