diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-06 12:31:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-06 12:31:50 +0100 |
| commit | 2add2dbdaa9ff6ca6637ca22d6a9b7c7027751be (patch) | |
| tree | 585628b0ceacfbdef5b9661c4043b9f71dfe9b01 /src/gui/painting | |
| parent | f792fed2ff519ffac1436e41e47cc0504d253a77 (diff) | |
| parent | 4eda22ea0db1fc571ae9f44a68825056e6245548 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/network/access/http2/hpacktable_p.h
Change-Id: Ie0c296667dfdebba84f4858056a1ac80c24ee7df
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qbezier.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp index a3dcb02e07..ddd1d997f2 100644 --- a/src/gui/painting/qbezier.cpp +++ b/src/gui/painting/qbezier.cpp @@ -333,7 +333,9 @@ static ShiftResult shift(const QBezier *orig, QBezier *shifted, qreal offset, qr *shifted = QBezier::fromPoints(points_shifted[map[0]], points_shifted[map[1]], points_shifted[map[2]], points_shifted[map[3]]); - return good_offset(orig, shifted, offset, threshold); + if (np > 2) + return good_offset(orig, shifted, offset, threshold); + return Ok; } // This value is used to determine the length of control point vectors @@ -432,7 +434,6 @@ redo: } else if (res == Ok) { ++o; --b; - continue; } else if (res == Circle && maxSegments - (o - curveSegments) >= 2) { // add semi circle if (addCircle(b, offset, o)) |