]>
Commit | Line | Data |
---|---|---|
c19bec21 JB |
1 | --- scribus-1.5.8/scribus/plugins/import/pdf/slaoutput.cpp |
2 | +++ scribus-1.5.8/scribus/plugins/import/pdf/slaoutput.cpp | |
3 | @@ -3762,15 +3762,21 @@ void SlaOutputDev::getPenState(GfxState | |
4 | break;\r | |
5 | }\r | |
6 | double lw = state->getLineWidth();\r | |
7 | - double *dashPattern;\r | |
8 | +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)\r | |
9 | + const auto& dashPattern = state->getLineDash(&DashOffset);\r | |
10 | + QVector<double> pattern(dashPattern.size());\r | |
11 | + for (size_t i = 0; i < dashPattern.size(); ++i)\r | |
12 | + pattern[i] = dashPattern[i] / lw;\r | |
13 | + DashValues = pattern;\r | |
14 | +#else\r | |
15 | + double* dashPattern;\r | |
16 | int dashLength;\r | |
17 | state->getLineDash(&dashPattern, &dashLength, &DashOffset);\r | |
18 | QVector<double> pattern(dashLength);\r | |
19 | for (int i = 0; i < dashLength; ++i)\r | |
20 | - {\r | |
21 | pattern[i] = dashPattern[i] / lw;\r | |
22 | - }\r | |
23 | DashValues = pattern;\r | |
24 | +#endif\r | |
25 | }\r | |
26 | \r | |
27 | int SlaOutputDev::getBlendMode(GfxState *state)\r |