remove unused reduce order code
BUG=
Review URL: https://codereview.chromium.org/85763002
git-svn-id: http://skia.googlecode.com/svn/trunk@12377 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/PathOpsCubicIntersectionTest.cpp b/tests/PathOpsCubicIntersectionTest.cpp
index c8a2e05..8eb1756 100644
--- a/tests/PathOpsCubicIntersectionTest.cpp
+++ b/tests/PathOpsCubicIntersectionTest.cpp
@@ -19,10 +19,8 @@
const SkDCubic& cubic1 = tests[index][0];
const SkDCubic& cubic2 = tests[index][1];
SkReduceOrder reduce1, reduce2;
- int order1 = reduce1.reduce(cubic1, SkReduceOrder::kNo_Quadratics,
- SkReduceOrder::kFill_Style);
- int order2 = reduce2.reduce(cubic2, SkReduceOrder::kNo_Quadratics,
- SkReduceOrder::kFill_Style);
+ int order1 = reduce1.reduce(cubic1, SkReduceOrder::kNo_Quadratics);
+ int order2 = reduce2.reduce(cubic2, SkReduceOrder::kNo_Quadratics);
const bool showSkipped = false;
if (order1 < 4) {
if (showSkipped) {
diff --git a/tests/PathOpsCubicLineIntersectionTest.cpp b/tests/PathOpsCubicLineIntersectionTest.cpp
index 53e9d60..520ba97 100644
--- a/tests/PathOpsCubicLineIntersectionTest.cpp
+++ b/tests/PathOpsCubicLineIntersectionTest.cpp
@@ -49,8 +49,7 @@
SkASSERT(ValidLine(line));
SkReduceOrder reduce1;
SkReduceOrder reduce2;
- int order1 = reduce1.reduce(cubic, SkReduceOrder::kNo_Quadratics,
- SkReduceOrder::kFill_Style);
+ int order1 = reduce1.reduce(cubic, SkReduceOrder::kNo_Quadratics);
int order2 = reduce2.reduce(line);
if (order1 < 4) {
SkDebugf("[%d] cubic order=%d\n", iIndex, order1);
diff --git a/tests/PathOpsCubicQuadIntersectionTest.cpp b/tests/PathOpsCubicQuadIntersectionTest.cpp
index 94a2bf7..ce54b95 100644
--- a/tests/PathOpsCubicQuadIntersectionTest.cpp
+++ b/tests/PathOpsCubicQuadIntersectionTest.cpp
@@ -59,9 +59,8 @@
SkASSERT(ValidQuad(quad));
SkReduceOrder reduce1;
SkReduceOrder reduce2;
- int order1 = reduce1.reduce(cubic, SkReduceOrder::kNo_Quadratics,
- SkReduceOrder::kFill_Style);
- int order2 = reduce2.reduce(quad, SkReduceOrder::kFill_Style);
+ int order1 = reduce1.reduce(cubic, SkReduceOrder::kNo_Quadratics);
+ int order2 = reduce2.reduce(quad);
if (order1 != 4) {
SkDebugf("[%d] cubic order=%d\n", iIndex, order1);
REPORTER_ASSERT(reporter, 0);
diff --git a/tests/PathOpsCubicReduceOrderTest.cpp b/tests/PathOpsCubicReduceOrderTest.cpp
index e1520aa..3702ead 100644
--- a/tests/PathOpsCubicReduceOrderTest.cpp
+++ b/tests/PathOpsCubicReduceOrderTest.cpp
@@ -98,13 +98,14 @@
? firstTestIndex : SK_MaxS32;
int firstQuadraticModLineTest = run == RunAll ? 0 : run == RunQuadraticModLines
? firstTestIndex : SK_MaxS32;
+#if 0
int firstComputedLinesTest = run == RunAll ? 0 : run == RunComputedLines
? firstTestIndex : SK_MaxS32;
-
+#endif
for (index = firstPointDegeneratesTest; index < pointDegenerates_count; ++index) {
const SkDCubic& cubic = pointDegenerates[index];
SkASSERT(ValidCubic(cubic));
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
if (order != 1) {
SkDebugf("[%d] pointDegenerates order=%d\n", static_cast<int>(index), order);
REPORTER_ASSERT(reporter, 0);
@@ -113,18 +114,17 @@
for (index = firstNotPointDegeneratesTest; index < notPointDegenerates_count; ++index) {
const SkDCubic& cubic = notPointDegenerates[index];
SkASSERT(ValidCubic(cubic));
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
if (order == 1) {
SkDebugf("[%d] notPointDegenerates order=%d\n", static_cast<int>(index), order);
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics,
- SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
REPORTER_ASSERT(reporter, 0);
}
}
for (index = firstLinesTest; index < lines_count; ++index) {
const SkDCubic& cubic = lines[index];
SkASSERT(ValidCubic(cubic));
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
if (order != 2) {
SkDebugf("[%d] lines order=%d\n", static_cast<int>(index), order);
REPORTER_ASSERT(reporter, 0);
@@ -133,7 +133,7 @@
for (index = firstNotLinesTest; index < notLines_count; ++index) {
const SkDCubic& cubic = notLines[index];
SkASSERT(ValidCubic(cubic));
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
if (order == 2) {
SkDebugf("[%d] notLines order=%d\n", static_cast<int>(index), order);
REPORTER_ASSERT(reporter, 0);
@@ -142,7 +142,7 @@
for (index = firstModEpsilonTest; index < modEpsilonLines_count; ++index) {
const SkDCubic& cubic = modEpsilonLines[index];
SkASSERT(ValidCubic(cubic));
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
if (order == 2) {
SkDebugf("[%d] line mod by epsilon order=%d\n", static_cast<int>(index), order);
REPORTER_ASSERT(reporter, 0);
@@ -151,18 +151,17 @@
for (index = firstLessEpsilonTest; index < lessEpsilonLines_count; ++index) {
const SkDCubic& cubic = lessEpsilonLines[index];
SkASSERT(ValidCubic(cubic));
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
if (order != 2) {
SkDebugf("[%d] line less by epsilon/2 order=%d\n", static_cast<int>(index), order);
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics,
- SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
REPORTER_ASSERT(reporter, 0);
}
}
for (index = firstNegEpsilonTest; index < negEpsilonLines_count; ++index) {
const SkDCubic& cubic = negEpsilonLines[index];
SkASSERT(ValidCubic(cubic));
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
if (order != 2) {
SkDebugf("[%d] line neg by epsilon/2 order=%d\n", static_cast<int>(index), order);
REPORTER_ASSERT(reporter, 0);
@@ -172,7 +171,7 @@
const SkDQuad& quad = quadraticPoints[index];
SkASSERT(ValidQuad(quad));
SkDCubic cubic = quad.toCubic();
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
if (order != 1) {
SkDebugf("[%d] point quad order=%d\n", static_cast<int>(index), order);
REPORTER_ASSERT(reporter, 0);
@@ -182,7 +181,7 @@
const SkDQuad& quad = quadraticLines[index];
SkASSERT(ValidQuad(quad));
SkDCubic cubic = quad.toCubic();
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
if (order != 2) {
SkDebugf("[%d] line quad order=%d\n", static_cast<int>(index), order);
REPORTER_ASSERT(reporter, 0);
@@ -192,14 +191,15 @@
const SkDQuad& quad = quadraticModEpsilonLines[index];
SkASSERT(ValidQuad(quad));
SkDCubic cubic = quad.toCubic();
- order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics);
if (order != 3) {
SkDebugf("[%d] line mod quad order=%d\n", static_cast<int>(index), order);
REPORTER_ASSERT(reporter, 0);
}
}
- // test if computed line end points are valid
+#if 0 // disable test until stroke reduction is supported
+// test if computed line end points are valid
for (index = firstComputedLinesTest; index < lines_count; ++index) {
const SkDCubic& cubic = lines[index];
SkASSERT(ValidCubic(cubic));
@@ -236,6 +236,7 @@
}
}
}
+#endif
}
#include "TestClassDef.h"
diff --git a/tests/PathOpsQuadIntersectionTest.cpp b/tests/PathOpsQuadIntersectionTest.cpp
index f0090a6..3fdbb5f 100644
--- a/tests/PathOpsQuadIntersectionTest.cpp
+++ b/tests/PathOpsQuadIntersectionTest.cpp
@@ -19,8 +19,8 @@
const SkDQuad& quad2 = quadraticTests[index][1];
SkASSERT(ValidQuad(quad2));
SkReduceOrder reduce1, reduce2;
- int order1 = reduce1.reduce(quad1, SkReduceOrder::kFill_Style);
- int order2 = reduce2.reduce(quad2, SkReduceOrder::kFill_Style);
+ int order1 = reduce1.reduce(quad1);
+ int order2 = reduce2.reduce(quad2);
if (order1 < 3) {
if (showSkipped) {
SkDebugf("[%d] quad1 order=%d\n", static_cast<int>(index), order1);
diff --git a/tests/PathOpsQuadLineIntersectionTest.cpp b/tests/PathOpsQuadLineIntersectionTest.cpp
index 2bfa7f9..775643f 100644
--- a/tests/PathOpsQuadLineIntersectionTest.cpp
+++ b/tests/PathOpsQuadLineIntersectionTest.cpp
@@ -109,7 +109,7 @@
const SkDLine& line = lineQuadTests[index].line;
SkASSERT(ValidLine(line));
SkReduceOrder reducer1, reducer2;
- int order1 = reducer1.reduce(quad, SkReduceOrder::kFill_Style);
+ int order1 = reducer1.reduce(quad);
int order2 = reducer2.reduce(line);
if (order1 < 3) {
SkDebugf("%s [%d] quad order=%d\n", __FUNCTION__, iIndex, order1);
diff --git a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
index 63f9447..7090c10 100644
--- a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
+++ b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
@@ -84,7 +84,7 @@
SkDQuad quad = {{{(double) ax, (double) ay}, {(double) bx, (double) by},
{(double) cx, (double) cy}}};
SkReduceOrder reducer;
- int order = reducer.reduce(quad, SkReduceOrder::kFill_Style);
+ int order = reducer.reduce(quad);
if (order < 3) {
return;
}
diff --git a/tests/PathOpsQuadReduceOrderTest.cpp b/tests/PathOpsQuadReduceOrderTest.cpp
index 6709ae7..2626847 100644
--- a/tests/PathOpsQuadReduceOrderTest.cpp
+++ b/tests/PathOpsQuadReduceOrderTest.cpp
@@ -21,7 +21,7 @@
for (size_t index = 0; index < testSetCount; ++index) {
const SkDQuad& quad = testSet[index];
SkReduceOrder reducer;
- SkDEBUGCODE(int result = ) reducer.reduce(quad, SkReduceOrder::kFill_Style);
+ SkDEBUGCODE(int result = ) reducer.reduce(quad);
SkASSERT(result == 3);
}
}
@@ -48,14 +48,14 @@
for (index = firstQuadraticLineTest; index < quadraticLines_count; ++index) {
const SkDQuad& quad = quadraticLines[index];
- order = reducer.reduce(quad, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(quad);
if (order != 2) {
SkDebugf("[%d] line quad order=%d\n", (int) index, order);
}
}
for (index = firstQuadraticModLineTest; index < quadraticModEpsilonLines_count; ++index) {
const SkDQuad& quad = quadraticModEpsilonLines[index];
- order = reducer.reduce(quad, SkReduceOrder::kFill_Style);
+ order = reducer.reduce(quad);
if (order != 3) {
SkDebugf("[%d] line mod quad order=%d\n", (int) index, order);
}