sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
New commits: commit a9cc06fa45d4cd9547f40a9869c64c912b821b42 Author: LuboÅ¡ LuÅák <[email protected]> Date: Wed Sep 21 15:13:25 2011 +0000 build without glib poppler bindings - there's not configure check for it, only for poppler itself - and it's not actually used anyway diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 8a1708c..2f8d717 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -68,7 +68,11 @@ class PDFDoc; #define POPPLER_CHECK_VERSION(major,minor,micro) (0) typedef GString GooString; #else -#include <glib/poppler-features.h> +#include <cpp/poppler-version.h> +#define POPPLER_CHECK_VERSION(major,minor,micro) \ + (POPPLER_VERSION_MAJOR > (major) || \ + (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \ + (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro))) #endif namespace pdfi commit 9540db43f3f1b11d3407a45aefda235d7e78f76b Author: Caolán McNamara <[email protected]> Date: Fri Sep 2 12:15:49 2011 +0000 Resolves: rhbz#735182 libreoffice doesn't build with poppler-0.17.3 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 5022dd5..bd6d721 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer ) void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) { // dump JPEG file as-is +#if POPPLER_CHECK_VERSION(0, 17, 3) + str = str->getBaseStream(); +#else str = ((DCTStream *)str)->getRawStream(); +#endif str->reset(); int c; @@ -490,7 +494,7 @@ void PDFOutDev::endPage() } #if POPPLER_CHECK_VERSION(0, 17, 0) -void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog) +void PDFOutDev::processLink(AnnotLink *link, Catalog *) #else void PDFOutDev::processLink(Link* link, Catalog*) #endif commit 53e66aea4c1b3617363fd138a7903190d964da6b Author: Tomáš Chvátal <[email protected]> Date: Fri Sep 30 11:51:04 2011 +0200 This is merge of f6f8f67460bba296c49f794d14621b7313df4f7d. It is not posible to git-am due to merge to core/ repository. It had one minor collision on pdfioutdev_gpl.hxx. Orginal header: From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001 From: Caolán McNamara <[email protected]> Date: Tue, 19 Jul 2011 07:54:07 +0000 Subject: poppler 0.17.0 changed its api for no some reason or other 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..8a1708c 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);
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
