- fix building with poopler 21.03

[packages/scribus.git] / poppler.patch

--- scribus-1.5.6.1/scribus/plugins/import/pdf/slaoutput.cpp~	2020-11-14 23:37:11.000000000 +0100
+++ scribus-1.5.6.1/scribus/plugins/import/pdf/slaoutput.cpp	2021-04-02 22:18:18.385332709 +0200
@@ -2291,9 +2291,18 @@
 	return gTrue;\r
 }\r
 \r
-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)\r
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)\r
+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)\r
+#else\r
+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)\r
+#endif\r
 {\r
 //	qDebug() << "SlaOutputDev::tilingPatternFill";\r
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)\r
+	const double *bbox = tPat->getBBox();\r
+	const double *pmat = tPat->getMatrix();\r
+	Dict *resDict = tPat->getResDict();\r
+#endif\r
 	PDFRectangle box;\r
 	Gfx *gfx;\r
 	QString id;\r
@@ -2325,7 +2334,11 @@
 	// Unset the clip path as it is unrelated to the pattern's coordinate space.\r
 	QPainterPath savedClip = m_currentClipPath;\r
 	m_currentClipPath = QPainterPath();\r
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)\r
+        gfx->display(tPat->getContentStream());\r
+#else\r
 	gfx->display(str);\r
+#endif\r
 	m_currentClipPath = savedClip;\r
 	inPattern--;\r
 	gElements = m_groupStack.pop();\r
--- scribus-1.5.6.1/scribus/plugins/import/pdf/slaoutput.h~	2020-11-14 23:37:11.000000000 +0100
+++ scribus-1.5.6.1/scribus/plugins/import/pdf/slaoutput.h	2021-04-02 22:15:19.594513556 +0200
@@ -196,7 +196,11 @@
 	void stroke(GfxState *state) override;\r
 	void fill(GfxState *state) override;\r
 	void eoFill(GfxState *state) override;\r
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)\r
+	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;\r
+#else\r
 	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;\r
+#endif\r
 	GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) override { qDebug() << "Function Shaded Fill";  return gFalse; }\r
 	GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;\r
 	GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading)  override { return (shading->getExtend0() == shading->getExtend1()); }\r