forked from pool/scribus
cb97fc81f7
This fixes scribus build with poppler 21.03.0 (currently failing to build in Staging:O) - Add patches from upstream to fix build with popper 21.03.0: * 0001-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch * 0002-fix-build-of-pdf-import-plugin-with-poppler-21.03.0.patch OBS-URL: https://build.opensuse.org/request/show/880150 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=63
54 lines
3.3 KiB
Diff
54 lines
3.3 KiB
Diff
From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001
|
|
From: Jean Ghali <jghali@libertysurf.fr>
|
|
Date: Mon, 1 Mar 2021 21:52:54 +0000
|
|
Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler
|
|
21.03.0
|
|
|
|
git-svn-id: svn://scribus.net/trunk/Scribus@24537 11d20701-8431-0410-a711-e3c959e3b870
|
|
---
|
|
scribus/plugins/import/pdf/slaoutput.cpp | 12 +++++++++++-
|
|
scribus/plugins/import/pdf/slaoutput.h | 4 ++++
|
|
2 files changed, 15 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
|
|
index 7cbc73e8d4..d1b37a0c21 100644
|
|
--- a/scribus/plugins/import/pdf/slaoutput.cpp
|
|
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
|
|
@@ -2291,9 +2291,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh
|
|
return gTrue;
|
|
}
|
|
|
|
-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
|
|
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
|
|
+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep)
|
|
+#else
|
|
+GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
|
|
+#endif
|
|
{
|
|
// qDebug() << "SlaOutputDev::tilingPatternFill";
|
|
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
|
|
+ const double *bbox = tPat->getBBox();
|
|
+ const double *pmat = tPat->getMatrix();
|
|
+ Dict *resDict = tPat->getResDict();
|
|
+#endif
|
|
+
|
|
PDFRectangle box;
|
|
Gfx *gfx;
|
|
QString id;
|
|
diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
|
|
index 5149f19e31..66c34203ae 100644
|
|
--- a/scribus/plugins/import/pdf/slaoutput.h
|
|
+++ b/scribus/plugins/import/pdf/slaoutput.h
|
|
@@ -196,7 +196,11 @@ class SlaOutputDev : public OutputDev
|
|
void stroke(GfxState *state) override;
|
|
void fill(GfxState *state) override;
|
|
void eoFill(GfxState *state) override;
|
|
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
|
|
+ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override;
|
|
+#else
|
|
GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override;
|
|
+#endif
|
|
GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) override { qDebug() << "Function Shaded Fill"; return gFalse; }
|
|
GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;
|
|
GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override { return (shading->getExtend0() == shading->getExtend1()); }
|