diff options
author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-08-18 12:48:57 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-30 20:43:01 +0000 |
commit | 8572ae3eed4f22dc5eed388569bfa5031397ef7d (patch) | |
tree | ff1b13d833d7b182861b1fc96d792614b8c74929 | |
parent | 91b2141bba76283b188498680add23b9cc3b67f2 (diff) |
Painting: handle large and negative dash offset values
The mapping of the dash offset into the dash pattern was susceptible
to int overflow.
Change-Id: I254ed40b323ef516d10abc8e6008b14cfc23d2a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit ca604964f651b71f2b2a45a65e741167f520b714)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 5 | ||||
-rw-r--r-- | src/gui/painting/qstroker.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index bb2d9ef4bc..d1913ac36f 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -1633,8 +1633,9 @@ void QRasterPaintEngine::stroke(const QVectorPath &path, const QPen &pen) patternLength += pattern.at(i); if (patternLength > 0) { - int n = qFloor(dashOffset / patternLength); - dashOffset -= n * patternLength; + dashOffset = std::fmod(dashOffset, patternLength); + if (dashOffset < 0) + dashOffset += patternLength; while (dashOffset >= pattern.at(dashIndex)) { dashOffset -= pattern.at(dashIndex); if (++dashIndex >= pattern.size()) diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp index 79194c7cf8..d814dd0ea5 100644 --- a/src/gui/painting/qstroker.cpp +++ b/src/gui/painting/qstroker.cpp @@ -1133,7 +1133,9 @@ void QDashStroker::processCurrentSubpath() qreal doffset = m_dashOffset * m_stroke_width; // make sure doffset is in range [0..sumLength) - doffset -= qFloor(doffset * invSumLength) * sumLength; + doffset = std::fmod(doffset, sumLength); + if (doffset < 0) + doffset += sumLength; while (doffset >= dashes[idash]) { doffset -= dashes[idash]; |