diff options
| author | Rene Engelhard <rene@debian.org> | 2012-10-31 18:00:18 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2012-10-31 18:01:01 +0100 |
| commit | bb6a12caede53029ecb99810f2f58daae4e11af7 (patch) | |
| tree | 7a1b7277efb6b8c36c6631629a856bd611738683 | |
| parent | e5b645bc60a0b058632a75613d31db3398ed20f5 (diff) | |
fix sdext build with poppler >= 0.19.x
Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index d1dc1273c9a7..145569b95917 100644 --- a/configure.ac +++ b/configure.ac @@ -9788,9 +9788,6 @@ if test "x$enable_ext_pdfimport" != "xno" -a "x$enable_extension_integration" != AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) - # sdext test fails with 0.20.0 - PKG_CHECK_MODULES( POPPLER_NOT_0_20_0, poppler < 0.20.0, - , [AC_MSG_ERROR([Poppler 0.20.x is broken, do not use --with-system-poppler or use a different version])]) AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS save_CPPFLAGS=$CPPFLAGS diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 77a9aa6ba840..7adc48718d28 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -489,7 +489,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 0a19b9a34b97..e5e48fc8a1a0 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -189,10 +189,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 |