diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-26 01:00:18 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-26 01:00:19 +0100 |
| commit | 04479f19522879dad821b0e643d0576d19a6d689 (patch) | |
| tree | 2294bb6cb66c34457d6b4eda5c07b3e441be6a59 /src/gui/painting | |
| parent | 85b0ce8ca36d52db71b519ee8d2a1ce369c53a81 (diff) | |
| parent | 00cfb4d7801ec9b5d9b070879ef4a962390628b7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Id511850002d9274d17891c063376ac4b3ff939dd
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qrasterizer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp index 52501880e4..b4014272f4 100644 --- a/src/gui/painting/qrasterizer.cpp +++ b/src/gui/painting/qrasterizer.cpp @@ -755,11 +755,9 @@ static inline int qSafeFloatToQ16Dot16(qreal x) void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width, bool squareCap) { - if (a == b || width == 0 || d->clipRect.isEmpty()) + if (a == b || !(width > 0.0) || d->clipRect.isEmpty()) return; - Q_ASSERT(width > 0.0); - QPointF pa = a; QPointF pb = b; |