Author: jghali
Date: Tue Mar 2 20:20:04 2021
New Revision: 24542
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24542
Log:
Fixes for building with poppler 21.03.0
Modified:
branches/Version156/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
branches/Version156/Scribus/scribus/plugins/import/pdf/slaoutput.h
Modified: branches/Version156/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24542&path=/branches/Version156/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
==============================================================================
--- branches/Version156/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
(original)
+++ branches/Version156/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
Tue Mar 2 20:20:04 2021
@@ -2291,9 +2291,19 @@
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 @@
// 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();
Modified: branches/Version156/Scribus/scribus/plugins/import/pdf/slaoutput.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24542&path=/branches/Version156/Scribus/scribus/plugins/import/pdf/slaoutput.h
==============================================================================
--- branches/Version156/Scribus/scribus/plugins/import/pdf/slaoutput.h
(original)
+++ branches/Version156/Scribus/scribus/plugins/import/pdf/slaoutput.h Tue Mar
2 20:20:04 2021
@@ -196,7 +196,11 @@
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()); }
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
