AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix handling of stroked cubics when we exhaust our recursion limit.

Browse Source 
Review URL: https://codereview.chromium.org/12567006

git-svn-id: http://skia.googlecode.com/svn/trunk@8093 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-03-12 12:57:04 +00:00
parent ff6ea2663f
commit 5687a3e93b
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/SkStroke.cpp
View File

@ -303,13 +303,23 @@ DRAW_LINE:
SkAssertResult(set_normal_unitnormal(cd, fRadius, normalCD, unitNormalCD));
bool degenerateBC = !set_normal_unitnormal(pts[1], pts[2], fRadius,
&normalBC, &unitNormalBC);
#ifndef SK_IGNORE_CUBIC_STROKE_FIX
if (subDivide <= 0) {
if (degenerateBC) {
goto DRAW_LINE;
} else {
goto DRAW_CUBIC;
}
}
#endif
if (degenerateBC || normals_too_curvy(unitNormalAB, unitNormalBC) ||
normals_too_curvy(unitNormalBC, *unitNormalCD)) {
#ifdef SK_IGNORE_CUBIC_STROKE_FIX
// subdivide if we can
if (--subDivide < 0) {
goto DRAW_LINE;
}
#endif
SkPoint tmp[7];
SkVector norm, unit, dummy, unitDummy;
@ -320,6 +330,9 @@ DRAW_LINE:
// normals for CD
this->cubic_to(&tmp[3], norm, unit, &dummy, &unitDummy, subDivide);
} else {
#ifndef SK_IGNORE_CUBIC_STROKE_FIX
DRAW_CUBIC:
#endif
SkVector normalB, normalC;
// need normals to inset/outset the off-curve pts B and C