diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-26 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-26 01:00:13 +0200 |
| commit | 0dff40adf81d0bc2023c109abf266053431bfcd0 (patch) | |
| tree | 85776cb125584759b706f45f1465bd5d3d9ccfe4 /src/gui/painting/qstroker.cpp | |
| parent | 7db9e02ad11c391c1d616defd11e7deb2718d60a (diff) | |
| parent | 913dd26c92f406e3da83ed83701ce47e659bcc48 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I6ecf7074eda57ef4954fb3fdc7a6d1e8cd229340
Diffstat (limited to 'src/gui/painting/qstroker.cpp')
| -rw-r--r-- | src/gui/painting/qstroker.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp index c01531caf2..327190b678 100644 --- a/src/gui/painting/qstroker.cpp +++ b/src/gui/painting/qstroker.cpp @@ -1151,6 +1151,8 @@ void QDashStroker::processCurrentSubpath() QSubpathFlatIterator it(&m_elements, m_dashThreshold); qfixed2d prev = it.next(); + if (!prev.isFinite()) + return; bool clipping = !m_clip_rect.isEmpty(); qfixed2d move_to_pos = prev; @@ -1166,6 +1168,8 @@ void QDashStroker::processCurrentSubpath() bool hasMoveTo = false; while (it.hasNext()) { QStrokerOps::Element e = it.next(); + if (!qfixed2d(e).isFinite()) + continue; Q_ASSERT(e.isLineTo()); cline = QLineF(qt_fixed_to_real(prev.x), |