fix valgrind
(A recently added fuzzer test broke the valgrind bot, intentionally,
to isolate an uninitialized memory bug.)
If the conic has ordered points, but cannot be broken into parts,
treat it as if it were monotonic.
R=reed@google.com
BUG=skia:4757
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1568513002
Review URL: https://codereview.chromium.org/1568513002
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 37592dd..757cae0 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -2764,16 +2764,10 @@
static int winding_conic(const SkPoint pts[], SkScalar x, SkScalar y, SkScalar weight,
int* onCurveCount) {
SkConic conic(pts, weight);
- SkConic *c = &conic;
SkConic chopped[2];
- int n = 0;
-
- if (!is_mono_quad(pts[0].fY, pts[1].fY, pts[2].fY)) {
- n = conic.chopAtYExtrema(chopped);
- c = chopped;
- }
- int w = winding_mono_conic(*c, x, y, onCurveCount);
- if (n > 0) {
+ bool isMono = is_mono_quad(pts[0].fY, pts[1].fY, pts[2].fY) || !conic.chopAtYExtrema(chopped);
+ int w = winding_mono_conic(isMono ? conic : chopped[0], x, y, onCurveCount);
+ if (!isMono) {
w += winding_mono_conic(chopped[1], x, y, onCurveCount);
}
return w;