remove unused reduce order code

tests/PathOpsCubicReduceOrderTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "PathOpsCubicIntersectionTestData.h"
 #include "PathOpsQuadIntersectionTestData.h"
 #include "PathOpsTestCommon.h"
 #include "SkIntersections.h"
@@ skipping 80 matching lines @@
     int firstLessEpsilonTest = run == RunAll ? 0 : run == RunLessEpsilonLines
             ? firstTestIndex : SK_MaxS32;
     int firstNegEpsilonTest = run == RunAll ? 0 : run == RunNegEpsilonLines
             ? firstTestIndex : SK_MaxS32;
     int firstQuadraticPointTest = run == RunAll ? 0 : run == RunQuadraticPoints
             ? firstTestIndex : SK_MaxS32;
     int firstQuadraticLineTest = run == RunAll ? 0 : run == RunQuadraticLines
             ? 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);
         }
     }
     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);
         }
     }
     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);
        }
     }
     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);
         }
     }
     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);
         }
     }
     for (index = firstQuadraticPointTest; index < quadraticPoints_count; ++index) {
         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);
         }
     }
     for (index = firstQuadraticLineTest; index < quadraticLines_count; ++index) {
         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);
         }
     }
     for (index = firstQuadraticModLineTest; index < quadraticModEpsilonLines_count; ++index) {
         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));
         bool controlsInside = controls_inside(cubic);
         order = reducer.reduce(cubic, SkReduceOrder::kAllow_Quadratics,
                 SkReduceOrder::kStroke_Style);
         if (order == 2 && reducer.fLine[0] == reducer.fLine[1]) {
             SkDebugf("[%d] line computed ends match order=%d\n", static_cast<int>(index), order);
             REPORTER_ASSERT(reporter, 0);
         }
@@ skipping 16 matching lines @@
                     && !AlmostEqualUlps(reducer.fLine[0].fY, bounds.fBottom))
                    || (!AlmostEqualUlps(reducer.fLine[1].fX, bounds.fLeft)
                     && !AlmostEqualUlps(reducer.fLine[1].fX, bounds.fRight))
                    || (!AlmostEqualUlps(reducer.fLine[1].fY, bounds.fTop)
                     && !AlmostEqualUlps(reducer.fLine[1].fY, bounds.fBottom))) {
                 SkDebugf("[%d] line computed tight bounds order=%d\n", static_cast<int>(index), order);
                 REPORTER_ASSERT(reporter, 0);
             }
         }
     }
+#endif
 }
 
 #include "TestClassDef.h"
 
 DEFINE_TESTCLASS_SHORT(PathOpsReduceOrderCubicTest)