1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't join between 2 same points

Browse Source 
Joining 2 points with same x,y values causes assert in QTriangulatingStroker::normalVector().

Task-number: QTBUG-26528
Change-Id: I2494d7f362e13e41a82753f4bacf97ffbc249cf9
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
This commit is contained in:
Charles Yin 2012-07-16 11:32:22 +10:00 committed by Qt by Nokia
parent b8b79a0f37
commit 87ff2c830d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/opengl/qtriangulatingstroker.cpp
View File

@ -231,8 +231,10 @@ void QTriangulatingStroker::process(const QVectorPath &path, const QPen &pen, co
|| float(pts[0]) != float(pts[2]) || float(pts[1]) != float(pts[3]) || float(pts[0]) != float(pts[2]) || float(pts[1]) != float(pts[3])
|| float(pts[2]) != float(pts[4]) || float(pts[3]) != float(pts[5])) || float(pts[2]) != float(pts[4]) || float(pts[3]) != float(pts[5]))
{ {
if (previousType != QPainterPath::MoveToElement) if (float(m_cx) != float(pts[0]) || float(m_cy) != float(pts[1])) {
join(pts); if (previousType != QPainterPath::MoveToElement)
join(pts);
}
cubicTo(pts); cubicTo(pts);
previousType = QPainterPath::CurveToElement; previousType = QPainterPath::CurveToElement;
previousPts = pts + 4; previousPts = pts + 4;