forked from pool/scribus
7cae6045e8
Port to python3 and fix build with newer poppler versions Tested with poppler 0.84.0 and the versions in TW and Leap, builds fine now with python 3.8.1 too. OBS-URL: https://build.opensuse.org/request/show/765017 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=50
83 lines
5.0 KiB
Diff
83 lines
5.0 KiB
Diff
From 6db15ec1af791377b28981601f8c296006de3c6f Mon Sep 17 00:00:00 2001
|
|
From: Craig Bradney <mrb@scribus.info>
|
|
Date: Mon, 28 Oct 2019 22:11:56 +0000
|
|
Subject: [PATCH] Work around poppler 0.82 signature changes
|
|
|
|
git-svn-id: svn://scribus.net/trunk/Scribus@23287 11d20701-8431-0410-a711-e3c959e3b870
|
|
---
|
|
scribus/plugins/import/pdf/slaoutput.cpp | 14 +++++++++++++-
|
|
scribus/plugins/import/pdf/slaoutput.h | 9 +++++++++
|
|
2 files changed, 22 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
|
|
index 6094f3d9eb..f3d6446880 100644
|
|
--- a/scribus/plugins/import/pdf/slaoutput.cpp
|
|
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
|
|
@@ -2784,7 +2784,11 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, i
|
|
delete[] mbuffer;
|
|
}
|
|
|
|
-void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg)
|
|
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0)
|
|
+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int* maskColors, GBool inlineImg)
|
|
+#else
|
|
+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int* maskColors, GBool inlineImg)
|
|
+#endif
|
|
{
|
|
ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
|
|
// qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors;
|
|
@@ -3365,7 +3369,11 @@ void SlaOutputDev::updateFont(GfxState *state)
|
|
fontsrc->unref();
|
|
}
|
|
|
|
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0)
|
|
void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen)
|
|
+#else
|
|
+void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen)
|
|
+#endif
|
|
{
|
|
double x1, y1, x2, y2;
|
|
int render;
|
|
@@ -3452,7 +3460,11 @@ void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub
|
|
}
|
|
}
|
|
|
|
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0)
|
|
GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)
|
|
+#else
|
|
+GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, const Unicode *u, int uLen)
|
|
+#endif
|
|
{
|
|
// qDebug() << "beginType3Char";
|
|
GfxFont *gfxFont;
|
|
diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
|
|
index bc4350a034..b5905184e5 100644
|
|
--- a/scribus/plugins/import/pdf/slaoutput.h
|
|
+++ b/scribus/plugins/import/pdf/slaoutput.h
|
|
@@ -229,7 +229,11 @@ class SlaOutputDev : public OutputDev
|
|
|
|
//----- image drawing
|
|
void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override;
|
|
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0)
|
|
void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override;
|
|
+#else
|
|
+ void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int *maskColors, GBool inlineImg) override;
|
|
+#endif
|
|
void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
|
|
int width, int height,
|
|
GfxImageColorMap *colorMap,
|
|
@@ -261,8 +265,13 @@ class SlaOutputDev : public OutputDev
|
|
//----- text drawing
|
|
void beginTextObject(GfxState *state) override;
|
|
void endTextObject(GfxState *state) override;
|
|
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0)
|
|
void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override;
|
|
GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override;
|
|
+#else
|
|
+ void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, const Unicode * /*u*/, int /*uLen*/) override;
|
|
+ GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, const Unicode * /*u*/, int /*uLen*/) override;
|
|
+#endif
|
|
void endType3Char(GfxState * /*state*/) override;
|
|
void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override;
|
|
void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override;
|