path ops work in progress

tests/PathOpsLineIntersectionTest.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 "PathOpsTestCommon.h"
 #include "SkIntersections.h"
 #include "SkPathOpsLine.h"
 #include "Test.h"
 
 // FIXME: add tests for intersecting, non-intersecting, degenerate, coincident
 static const SkDLine tests[][2] = {
+    {{{{90,230}, {160,60}}}, {{{60,120}, {260,120}}}},
+    {{{{90,230}, {160,60}}}, {{{181.176468,120}, {135.294128,120}}}},
     {{{{181.1764678955078125f, 120}, {186.3661956787109375f, 134.7042236328125f}}},
      {{{175.8309783935546875f, 141.5211334228515625f}, {187.8782806396484375f, 133.7258148193359375f}}}},
 #if 0  // FIXME: these fail because one line is too short and appears quasi-coincident
     {{{{158.000000, 926.000000}, {1108.00000, 926.000000}}},
             {{{1108.00000, 926.000000}, {1108.00000, 925.999634}}}},
     {{{{1108,926}, {1108,925.9996337890625}}}, {{{158,926}, {1108,926}}}},
 #endif
     {{{{192, 4}, {243, 4}}}, {{{246, 4}, {189, 4}}}},
     {{{{246, 4}, {189, 4}}}, {{{192, 4}, {243, 4}}}},
     {{{{5, 0}, {0, 5}}}, {{{5, 4}, {1, 4}}}},
     {{{{0, 0}, {1, 0}}}, {{{1, 0}, {0, 0}}}},
     {{{{0, 0}, {0, 0}}}, {{{0, 0}, {1, 0}}}},
     {{{{0, 1}, {0, 1}}}, {{{0, 0}, {0, 2}}}},
     {{{{0, 0}, {1, 0}}}, {{{0, 0}, {2, 0}}}},
     {{{{1, 1}, {2, 2}}}, {{{0, 0}, {3, 3}}}},
     {{{{166.86950047022856, 112.69654129527828}, {166.86948801592692, 112.69655741235339}}},
      {{{166.86960700313026, 112.6965477747386}, {166.86925794355412, 112.69656471103423}}}}
 };
 
 static const size_t tests_count = SK_ARRAY_COUNT(tests);
 
 static const SkDLine noIntersect[][2] = {
+   {{{{(double) (2 - 1e-6f),2}, {(double) (2 - 1e-6f),4}}},
+    {{{2,1}, {2,3}}}},
+
     {{{{0, 0}, {1, 0}}}, {{{3, 0}, {2, 0}}}},
     {{{{0, 0}, {0, 0}}}, {{{1, 0}, {2, 0}}}},
     {{{{0, 1}, {0, 1}}}, {{{0, 3}, {0, 2}}}},
     {{{{0, 0}, {1, 0}}}, {{{2, 0}, {3, 0}}}},
     {{{{1, 1}, {2, 2}}}, {{{4, 4}, {3, 3}}}},
 };
 
 static const size_t noIntersect_count = SK_ARRAY_COUNT(noIntersect);
 
 static const SkDLine coincidentTests[][2] = {
+   {{{{979.304871, 561}, {1036.69507, 291}}},
+    {{{985.681519, 531}, {982.159790, 547.568542}}}},
+
+   {{{{232.159805, 547.568542}, {235.681549, 531}}},
+    {{{286.695129,291}, {229.304855,561}}}},
+
     {{{{186.3661956787109375f, 134.7042236328125f}, {187.8782806396484375f, 133.7258148193359375f}}},
      {{{175.8309783935546875f, 141.5211334228515625f}, {187.8782806396484375f, 133.7258148193359375f}}}},
 
     {{{{235.681549, 531.000000}, {280.318420, 321.000000}}},
      {{{286.695129, 291.000000}, {229.304855, 561.000000}}}},
 };
 
 static const size_t coincidentTests_count = SK_ARRAY_COUNT(coincidentTests);
 
 static void check_results(skiatest::Reporter* reporter, const SkDLine& line1, const SkDLine& line2,
@@ skipping 48 matching lines @@
         SkIntersections ts;
         ts.vertical(line1, top, bottom, line2[0].fX, line2[0].fY != top);
         check_results(reporter, line1, line2, ts);
     }
 }
 
 static void testOneCoincident(skiatest::Reporter* reporter, const SkDLine& line1,
                               const SkDLine& line2) {
     SkASSERT(ValidLine(line1));
     SkASSERT(ValidLine(line2));
-    SkIntersections ts2;
-    int pts2 = ts2.intersect(line1, line2);
-    REPORTER_ASSERT(reporter, pts2 == 2);
-    REPORTER_ASSERT(reporter, pts2 == ts2.used());
-    check_results(reporter, line1, line2, ts2);
-#if 0
     SkIntersections ts;
     int pts = ts.intersect(line1, line2);
-    REPORTER_ASSERT(reporter, pts == pts2);
     REPORTER_ASSERT(reporter, pts == 2);
     REPORTER_ASSERT(reporter, pts == ts.used());
     check_results(reporter, line1, line2, ts);
-#endif
 }
 
 static void PathOpsLineIntersectionTest(skiatest::Reporter* reporter) {
     size_t index;
     for (index = 0; index < coincidentTests_count; ++index) {
         const SkDLine& line1 = coincidentTests[index][0];
         const SkDLine& line2 = coincidentTests[index][1];
         testOneCoincident(reporter, line1, line2);
         reporter->bumpTestCount();
     }
@@ skipping 10 matching lines @@
         int pts = ts.intersect(line1, line2);
         REPORTER_ASSERT(reporter, !pts);
         REPORTER_ASSERT(reporter, pts == ts.used());
         reporter->bumpTestCount();
     }
 }
 
 static void PathOpsLineIntersectionOneOffTest(skiatest::Reporter* reporter) {
     int index = 0;
     SkASSERT(index < (int) tests_count);
-    const SkDLine& line1 = tests[index][0];
-    const SkDLine& line2 = tests[index][1];
-    testOne(reporter, line1, line2);
+    testOne(reporter, tests[index][0], tests[index][1]);
+    testOne(reporter, tests[1][0], tests[1][1]);
 }
 
 static void PathOpsLineIntersectionOneCoincidentTest(skiatest::Reporter* reporter) {
     int index = 0;
     SkASSERT(index < (int) coincidentTests_count);
     const SkDLine& line1 = coincidentTests[index][0];
     const SkDLine& line2 = coincidentTests[index][1];
     testOneCoincident(reporter, line1, line2);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS_SHORT(PathOpsLineIntersectionTest)
 
 DEFINE_TESTCLASS_SHORT(PathOpsLineIntersectionOneOffTest)
 
 DEFINE_TESTCLASS_SHORT(PathOpsLineIntersectionOneCoincidentTest)