diff options
author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2021-03-09 15:53:11 +0000 |
---|---|---|
committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2021-03-09 15:53:11 +0000 |
commit | 3bfab2f4b939dccdce98c2136288c9775ed6c87d (patch) | |
tree | 134cde513eecb13db5a093d9e6109f1b9d834126 /print/scribus-devel | |
parent | e6179a8bdd443c4eb24f3685af9c069a4caa484d (diff) | |
download | ports-3bfab2f4b939dccdce98c2136288c9775ed6c87d.tar.gz ports-3bfab2f4b939dccdce98c2136288c9775ed6c87d.zip |
print/scribus-devel: fix build after poppler 21.03.0 upgrade
PR: 254158
Submitted by: tcberner
Reported by: vvd@unislabs.com
Notes
Notes:
svn path=/head/; revision=567940
Diffstat (limited to 'print/scribus-devel')
-rw-r--r-- | print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp | 35 | ||||
-rw-r--r-- | print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h | 14 |
2 files changed, 49 insertions, 0 deletions
diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp new file mode 100644 index 000000000000..6215bebf6102 --- /dev/null +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp @@ -0,0 +1,35 @@ +--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2021-03-09 15:39:49 UTC ++++ scribus/plugins/import/pdf/slaoutput.cpp +@@ -2291,9 +2291,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat + 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; +@@ -2325,7 +2335,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, + // Unset the clip path as it is unrelated to the pattern's coordinate space. + QPainterPath savedClip = m_currentClipPath; + m_currentClipPath = QPainterPath(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0) ++ gfx->display(tPat->getContentStream()); ++#else + gfx->display(str); ++#endif + m_currentClipPath = savedClip; + inPattern--; + gElements = m_groupStack.pop(); diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h new file mode 100644 index 000000000000..7f043dc78555 --- /dev/null +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h @@ -0,0 +1,14 @@ +--- scribus/plugins/import/pdf/slaoutput.h.orig 2021-03-09 15:40:35 UTC ++++ scribus/plugins/import/pdf/slaoutput.h +@@ -196,7 +196,11 @@ class SlaOutputDev : public OutputDev (public) + 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()); } |