129a70963b
- Fix build with poppler 0.17.0 - Add python-lxml dependency for faster translation processing (forwarded request 84617 from namtrac) OBS-URL: https://build.opensuse.org/request/show/84623 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=22
61 lines
2.6 KiB
Diff
61 lines
2.6 KiB
Diff
diff -ur libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
--- libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-05-19 11:14:21.000000000 +0200
|
|
+++ libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-09-23 13:41:51.448872095 +0200
|
|
@@ -150,7 +150,11 @@
|
|
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;
|
|
@@ -489,7 +493,11 @@
|
|
printf("endPage\n");
|
|
}
|
|
|
|
+#if POPPLER_CHECK_VERSION(0, 17, 0)
|
|
+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
|
|
+#else
|
|
void PDFOutDev::processLink(Link* link, Catalog*)
|
|
+#endif
|
|
{
|
|
assert(link);
|
|
|
|
diff -ur libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
|
--- libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-05-19 11:14:21.000000000 +0200
|
|
+++ libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-09-23 13:42:48.346872091 +0200
|
|
@@ -65,7 +65,14 @@
|
|
class GfxFont;
|
|
class PDFDoc;
|
|
#ifndef SYSTEM_POPPLER
|
|
+#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
|
|
typedef GString GooString;
|
|
+#else
|
|
+#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
|
|
@@ -194,8 +201,12 @@
|
|
// 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);
|
|
Only in libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper: pdfioutdev_gpl.hxx.orig
|
|
Only in libreoffice-extensions-3.4.2.6.fixed/sdext/source/pdfimport/xpdfwrapper: pdfioutdev_gpl.hxx.rej
|