aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-07-11 11:01:43 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-11 15:30:28 +0000
commit1857ddbe218afd8ef32f672619ab13c0f853436c (patch)
treee8d562ec9910743e3020098e8e3c9d02e3305567 /tests
parentcd3e13a130e3d99790e80b329ef6d13591615fe0 (diff)
propogate simple angles in pathops
If an edge is unsortable, its winding value is untrustworthy; it cannot be added to the output on that alone. If one end adjoins a trusted edge, and that edge is added to the output, the untrusted edge can be added as well. Also add in msvs debugging for angles. With this change, all extended tests pass. TBR=reed@google.com Bug: skia:8125 Change-Id: I049c6efa2fa83edd7b49cdd598ec94c356481b0f Reviewed-on: https://skia-review.googlesource.com/140562 Commit-Queue: Cary Clark <caryclark@skia.org> Auto-Submit: Cary Clark <caryclark@skia.org> Reviewed-by: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/PathOpsDebug.cpp4
-rw-r--r--tests/PathOpsOpTest.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/PathOpsDebug.cpp b/tests/PathOpsDebug.cpp
index 942f99c7ae..a93c331cb5 100644
--- a/tests/PathOpsDebug.cpp
+++ b/tests/PathOpsDebug.cpp
@@ -1639,6 +1639,10 @@ namespace SkOpDebug {
point.dump();
}
+ void Dump(const SkOpAngle& angle) {
+ angle.dump();
+ }
+
// dummy definitions to fool msvs Visual Studio 2018 Immediate Window
#define DummyDefinitions(a, b) \
\
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 950baaf7b3..0420115ce4 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.cpp
@@ -5751,11 +5751,7 @@ static void testRect1_u(skiatest::Reporter* reporter, const char* filename) {
testPathOp(reporter, path, pathB, kUnion_SkPathOp, filename);
}
-// this test fails for now; it generates partial paths that are incorrectly
-// connected to form an area where it should not. The fix is to connect the
-// pieces using only contours that are part of the input data set.
static void filinmangust14(skiatest::Reporter* reporter, const char* filename) {
- return;
SkPath path, path1;
path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkBits2Float(0x440bc02c), SkBits2Float(0x4409c000)); // 559.003f, 551