diff options
| author | Rene Engelhard <rene@debian.org> | 2012-10-31 18:00:18 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-11-05 18:30:41 +0100 |
| commit | 3fcd0390b85de98d88a66d536aa200567d015ae7 (patch) | |
| tree | fda796e7d99c2ab4a2cd39f17477b4b9e63ce548 | |
| parent | 7770ce574efd1f089619fbc2f4b901b64852e197 (diff) | |
fix sdext build with poppler >= 0.19.x
Conflicts:
configure.ac
Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a
Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 87c0ab2afa0d..9d38e9b8e214 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -497,7 +497,9 @@ void PDFOutDev::endPage() printf("endPage\n"); } -#if POPPLER_CHECK_VERSION(0, 17, 0) +#if POPPLER_CHECK_VERSION(0, 19, 0) +void PDFOutDev::processLink(AnnotLink *link) +#elif POPPLER_CHECK_VERSION(0, 17, 0) void PDFOutDev::processLink(AnnotLink *link, Catalog *) #else void PDFOutDev::processLink(Link* link, Catalog*) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index bba8f58c9f71..1911d5777297 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -201,10 +201,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 + #if POPPLER_CHECK_VERSION(0, 19, 0) + virtual void processLink(AnnotLink *link); + #elif POPPLER_CHECK_VERSION(0, 17, 0) + virtual void processLink(AnnotLink *link, Catalog *catalog); + #else virtual void processLink(Link *link, Catalog *catalog); #endif |