aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/PathOpsOpTest.cpp
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-30 15:29:48 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-30 15:29:48 +0000
commitfa2f2a48f6822b88ab895fece1998af549c16ebe (patch)
tree0d599b224e79d079c58c811a628da3aa7e1382cb /tests/PathOpsOpTest.cpp
parent7950a9eba71f65365d88021680a16f245ad3fa68 (diff)
Revert "add asserts to point<-->verb helpers"
This reverts commit b4775ac7b55802e87231768f002e4b42f233b0aa. git-svn-id: http://skia.googlecode.com/svn/trunk@9347 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PathOpsOpTest.cpp')
-rw-r--r--tests/PathOpsOpTest.cpp169
1 files changed, 1 insertions, 168 deletions
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 48ed866a90..08dff90c29 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.cpp
@@ -1144,7 +1144,6 @@ static void cubicOp69d(skiatest::Reporter* reporter) {
testPathOp(reporter, path, pathB, kDifference_PathOp);
}
-
SkPathOp ops[] = {
kUnion_PathOp,
kXOR_PathOp,
@@ -1344,175 +1343,9 @@ static void cubicOp70d(skiatest::Reporter* reporter) {
testPathOp(reporter, path, pathB, kDifference_PathOp);
}
-static void cubicOp71d(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kWinding_FillType);
- path.moveTo(0,1);
- path.cubicTo(0,5, 4,1, 6,4);
- path.close();
- pathB.setFillType(SkPath::kWinding_FillType);
- pathB.moveTo(1,4);
- pathB.cubicTo(4,6, 1,0, 5,0);
- pathB.close();
- testPathOp(reporter, path, pathB, kDifference_PathOp);
-}
-
-static void cubicOp72i(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kWinding_FillType);
- path.moveTo(0,1);
- path.cubicTo(0,5, 5,2, 5,4);
- path.close();
- pathB.setFillType(SkPath::kWinding_FillType);
- pathB.moveTo(2,5);
- pathB.cubicTo(4,5, 1,0, 5,0);
- pathB.close();
- testPathOp(reporter, path, pathB, kIntersect_PathOp);
-}
-
-static void cubicOp73d(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kWinding_FillType);
- path.moveTo(0,1);
- path.cubicTo(3,4, 4,0, 6,4);
- path.lineTo(0,1);
- path.close();
- pathB.setFillType(SkPath::kWinding_FillType);
- pathB.moveTo(0,4);
- pathB.cubicTo(4,6, 1,0, 4,3);
- pathB.lineTo(0,4);
- pathB.close();
- testPathOp(reporter, path, pathB, kDifference_PathOp);
-}
-
-static void cubicOp75d(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kWinding_FillType);
- path.moveTo(0,1);
- path.cubicTo(0,4, 5,1, 6,4);
- path.lineTo(0,1);
- path.close();
- pathB.setFillType(SkPath::kWinding_FillType);
- pathB.moveTo(1,5);
- pathB.cubicTo(4,6, 1,0, 4,0);
- pathB.lineTo(1,5);
- pathB.close();
- testPathOp(reporter, path, pathB, kDifference_PathOp);
-}
-
-static void cubicOp77i(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kEvenOdd_FillType);
- path.moveTo(0,1);
- path.cubicTo(1,3, 2,0, 3,2);
- path.lineTo(0,1);
- path.close();
- pathB.setFillType(SkPath::kEvenOdd_FillType);
- pathB.moveTo(0,2);
- pathB.cubicTo(2,3, 1,0, 3,1);
- pathB.lineTo(0,2);
- pathB.close();
- testPathOp(reporter, path, pathB, kIntersect_PathOp);
-}
-
-static void cubicOp78u(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kEvenOdd_FillType);
- path.moveTo(1,6);
- path.cubicTo(1,6, 5,0, 6,1);
- path.lineTo(1,6);
- path.close();
- pathB.setFillType(SkPath::kEvenOdd_FillType);
- pathB.moveTo(0,5);
- pathB.cubicTo(1,6, 6,1, 6,1);
- pathB.lineTo(0,5);
- pathB.close();
- testPathOp(reporter, path, pathB, kUnion_PathOp);
-}
-
-static void cubicOp79d(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kWinding_FillType);
- path.moveTo(0,2);
- path.cubicTo(0,1, 3,-0.1f, 1,0);
- path.close();
- pathB.setFillType(SkPath::kWinding_FillType);
- pathB.moveTo(0,3);
- pathB.cubicTo(0,1, 2,0, 1,0);
- pathB.close();
- testPathOp(reporter, path, pathB, kDifference_PathOp);
-}
-
-static void cubicOp79u(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kWinding_FillType);
- path.moveTo(0,1);
- path.cubicTo(1,3, 1,0, 6,4);
- path.close();
- pathB.setFillType(SkPath::kWinding_FillType);
- pathB.moveTo(0,1);
- pathB.cubicTo(4,6, 1,0, 3,1);
- pathB.close();
- testPathOp(reporter, path, pathB, kIntersect_PathOp);
-}
-
-static void cubicOp80i(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kWinding_FillType);
- path.moveTo(0,1);
- path.cubicTo(2,3, 2,1, 4,3);
- path.lineTo(0,1);
- path.close();
- pathB.setFillType(SkPath::kWinding_FillType);
- pathB.moveTo(1,2);
- pathB.cubicTo(3,4, 1,0, 3,2);
- pathB.lineTo(1,2);
- pathB.close();
- testPathOp(reporter, path, pathB, kIntersect_PathOp);
-}
-
-static void cubicOp82i(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kEvenOdd_FillType);
- path.moveTo(0,1);
- path.cubicTo(2,3, 5,2, 3,0);
- path.lineTo(0,1);
- path.close();
- pathB.setFillType(SkPath::kWinding_FillType);
- pathB.moveTo(2,5);
- pathB.cubicTo(0,3, 1,0, 3,2);
- pathB.lineTo(2,5);
- pathB.close();
- testPathOp(reporter, path, pathB, kIntersect_PathOp);
-}
-
-static void cubicOp81d(skiatest::Reporter* reporter) {
- SkPath path, pathB;
- path.setFillType(SkPath::kWinding_FillType);
- path.moveTo(0,1);
- path.cubicTo(4,6, 4,3, 5,4);
- path.close();
- pathB.setFillType(SkPath::kWinding_FillType);
- pathB.moveTo(3,4);
- pathB.cubicTo(4,5, 1,0, 6,4);
- pathB.close();
- testPathOp(reporter, path, pathB, kDifference_PathOp);
-}
-
-static void (*firstTest)(skiatest::Reporter* ) = cubicOp81d;
+static void (*firstTest)(skiatest::Reporter* ) = 0;
static struct TestDesc tests[] = {
- TEST(cubicOp82i),
- TEST(cubicOp81d),
- TEST(cubicOp80i),
- TEST(cubicOp79u),
- TEST(cubicOp79d),
- TEST(cubicOp78u),
- TEST(cubicOp77i),
- TEST(cubicOp75d),
- TEST(cubicOp73d),
- TEST(cubicOp72i),
- TEST(cubicOp71d),
TEST(skp5),
TEST(skp4),
TEST(skp3),