yet another path is rect exploit
This one accumulates the othershoot when all four sides
have the same direction, and the final side when closed
should cause the overshoot to be ignored.
Docs-Preview: https://skia.org/?cl=121787
Bug: 824145,skia:7792
Change-Id: I71ea0fcdd0f03a4fcac224b57220c65c321112f6
Reviewed-on: https://skia-review.googlesource.com/121787
Commit-Queue: Cary Clark <caryclark@skia.org>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Auto-Submit: Cary Clark <caryclark@skia.org>
Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index d5538f7..0ff5edf 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -453,6 +453,7 @@
SkPoint lineStart; // used to construct line from previous point
const SkPoint* firstPt = nullptr; // first point in the rect (last of first moves)
const SkPoint* lastPt = nullptr; // last point in the rect (last of lines or first if closed)
+ const SkPoint* lastCountedPt = nullptr; // point creating 3rd corner
const SkPoint* pts = *ptsPtr;
const SkPoint* savePts = nullptr; // used to allow caller to iterate through a pair of rects
lineStart.set(0, 0);
@@ -473,6 +474,9 @@
accumulatingRect = false;
case kLine_Verb: {
if (accumulatingRect) {
+ lastCountedPt = pts;
+ }
+ if (kClose_Verb != verb) {
lastPt = pts;
}
SkPoint lineEnd = kClose_Verb == verb ? *firstPt : *pts++;
@@ -512,6 +516,7 @@
if ((directions[0] ^ directions[2]) != 2) {
return false;
}
+ accumulatingRect = false;
} else if (corners == 4) {
if ((directions[1] ^ directions[3]) != 2) {
return false;
@@ -574,7 +579,7 @@
*ptsPtr = savePts;
}
if (result && rect) {
- ptrdiff_t count = lastPt - firstPt + 1;
+ ptrdiff_t count = lastCountedPt - firstPt + 1;
rect->set(firstPt, (int) count);
}
if (result && isClosed) {