cumulative pathops patch

tests/PathOpsCubicIntersectionTestData.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 <limits>
@@ skipping 28 matching lines @@
     {{{0, 0}, {1, 1}, {N, 0}, {0, 0}}},
     {{{0, 0}, {D, 0}, {1, 1}, {0, 0}}},
     {{{0, 0}, {1, 1}, {D, 0}, {0, 0}}},
     {{{0, 0}, {N, 0}, {1, 1}, {0, 0}}},
     {{{1, 1}, {2, 2}, {2, 2+N}, {1, 1}}},
 };
 
 const size_t pointDegenerates_count = SK_ARRAY_COUNT(pointDegenerates);
 
 const SkDCubic notPointDegenerates[] = {
-    {{{1 + FLT_EPSILON * 2, 1}, {1, FLT_EPSILON * 2}, {1, 1}, {1, 1}}},
-    {{{1 + FLT_EPSILON * 2, 1}, {1 - FLT_EPSILON * 2, 1}, {1, 1}, {1, 1}}}
+    {{{1 + FLT_EPSILON * 8, 1}, {1, FLT_EPSILON * 8}, {1, 1}, {1, 1}}},
+    {{{1 + FLT_EPSILON * 8, 1}, {1 - FLT_EPSILON * 8, 1}, {1, 1}, {1, 1}}}
 };
 
 const size_t notPointDegenerates_count =
         SK_ARRAY_COUNT(notPointDegenerates);
 
 // from http://www.truetex.com/bezint.htm
 const SkDCubic tests[][2] = {
     {  // intersects in one place (data gives bezier clip fits
      {{{0, 45},
       {6.0094158284751593, 51.610357411322688},
@@ skipping 88 matching lines @@
     {{{0, 0}, {0, 0}, {0, 1}, {1, 0}}},
     {{{0, 0}, {0, 1}, {0, 0}, {1, 0}}},
     {{{0, 0}, {0, 1}, {1, 0}, {0, 0}}},
     {{{0, 1}, {0, 0}, {0, 0}, {1, 0}}},
     {{{0, 1}, {0, 0}, {1, 0}, {0, 0}}},
     {{{0, 1}, {1, 0}, {0, 0}, {0, 0}}},
 };
 
 const size_t notLines_count = SK_ARRAY_COUNT(notLines);
 
-static const double E = FLT_EPSILON * 2;
-static const double F = FLT_EPSILON * 3;
+static const double E = FLT_EPSILON * 8;
+static const double F = FLT_EPSILON * 8;
 
 const SkDCubic modEpsilonLines[] = {
     {{{0, E}, {0, 0}, {0, 0}, {1, 0}}},  // horizontal
     {{{0, 0}, {0, E}, {1, 0}, {0, 0}}},
     {{{0, 0}, {1, 0}, {0, E}, {0, 0}}},
     {{{1, 0}, {0, 0}, {0, 0}, {0, E}}},
     {{{1, E}, {2, 0}, {3, 0}, {4, 0}}},
     {{{E, 0}, {0, 0}, {0, 0}, {0, 1}}},  // vertical
     {{{0, 0}, {E, 0}, {0, 1}, {0, 0}}},
     {{{0, 0}, {0, 1}, {E, 0}, {0, 0}}},
     {{{0, 1}, {0, 0}, {0, 0}, {E, 0}}},
     {{{E, 1}, {0, 2}, {0, 3}, {0, 4}}},
     {{{E, 0}, {0, 0}, {0, 0}, {1, 1}}},  // 3 coincident
     {{{0, 0}, {E, 0}, {1, 1}, {0, 0}}},
     {{{0, 0}, {1, 1}, {E, 0}, {0, 0}}},
     {{{1, 1}, {0, 0}, {0, 0}, {E, 0}}},
     {{{0, E}, {0, 0}, {1, 1}, {2, 2}}},  // 2 coincident
     {{{0, 0}, {1, 1}, {0, E}, {2, 2}}},
     {{{0, 0}, {1, 1}, {2, 2}, {0, E}}},
     {{{1, 1}, {0, E}, {0, 0}, {2, 2}}},
     {{{1, 1}, {0, E}, {2, 2}, {0, 0}}},
     {{{1, 1}, {2, 2}, {E, 0}, {0, 0}}},
     {{{1, 1}, {2, 2+E}, {3, 3}, {2, 2}}},  // middle-last coincident
     {{{1, 1}, {2+E, 2}, {3, 3}, {3, 3}}},  // middle-last coincident
     {{{1, 1}, {1, 1}, {2, 2}, {2+E, 2}}},  // 2 pairs coincident
     {{{1, 1}, {2, 2}, {1, 1}, {2+E, 2}}},
     {{{1, 1}, {2, 2}, {2, 2+E}, {1, 1}}},
     {{{1, 1}, {1, 1+E}, {3, 3}, {3, 3}}},  // first-middle middle-last coincident
     {{{1, 1}, {2+E, 2}, {3, 3}, {4, 4}}},  // no coincident
-    {{{1, 1}, {3, 3}, {2, 2}, {4, 4+F}}},  // INVESTIGATE: why the epsilon is bigger
-    {{{1, 1+F}, {2, 2}, {4, 4}, {3, 3}}},  // INVESTIGATE: why the epsilon is bigger
+    {{{1, 1}, {3, 3}, {2, 2}, {4, 4+F+F}}},  // INVESTIGATE: why the epsilon is bigger
+    {{{1, 1+F+F}, {2, 2}, {4, 4}, {3, 3}}},  // INVESTIGATE: why the epsilon is bigger
     {{{1, 1}, {3, 3}, {4, 4+E}, {2, 2}}},
     {{{1, 1}, {4, 4}, {2, 2}, {3, 3+E}}},
     {{{1, 1}, {4, 4}, {3, 3}, {2+E, 2}}},
     {{{2, 2}, {1, 1}, {3+E, 3}, {4, 4}}},
     {{{2, 2}, {1+E, 1}, {4, 4}, {3, 3}}},
     {{{2, 2+E}, {3, 3}, {1, 1}, {4, 4}}},
     {{{2+E, 2}, {3, 3}, {4, 4}, {1, 1}}},
     {{{2, 2}, {4+E, 4}, {1, 1}, {3, 3}}},
     {{{2, 2}, {4, 4}, {3, 3}, {1, 1+E}}},
 };
@@ skipping 64 matching lines @@
     {{{1, 1}, {4, 4}, {3, 3}, {2+M, 2}}},  // INVESTIGATE: why the epsilon is smaller
     {{{2, 2}, {1, 1}, {3+N, 3}, {4, 4}}},
     {{{2, 2}, {1+N, 1}, {4, 4}, {3, 3}}},
     {{{2, 2+N}, {3, 3}, {1, 1}, {4, 4}}},
     {{{2+M, 2}, {3, 3}, {4, 4}, {1, 1}}},  // INVESTIGATE: why the epsilon is smaller
     {{{2, 2}, {4+N, 4}, {1, 1}, {3, 3}}},
     {{{2, 2}, {4, 4}, {3, 3}, {1, 1+N}}},
 };
 
 const size_t negEpsilonLines_count = SK_ARRAY_COUNT(negEpsilonLines);