pathops work in progress

tests/PathOpsOpTest.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 "PathOpsExtendedTest.h"
 
 #define TEST(name) { name, #name }
 
@@ skipping 2700 matching lines @@
     SkPath pathB;
     pathB.setFillType(SkPath::kWinding_FillType);
     pathB.moveTo(575, 925);
     pathB.lineTo(693, 925);
     pathB.lineTo(693, 926);
     pathB.lineTo(575, 926);
     pathB.close();
     testPathOp(reporter, path, pathB, kIntersect_PathOp);
 }
 
-#define SKPS_WORKING 0
-#if SKPS_WORKING
 static void skpcarpetplanet_ru22(skiatest::Reporter* reporter) {
     SkPath path;
     path.setFillType(SkPath::kEvenOdd_FillType);
     path.moveTo(195, 785);
     path.cubicTo(124.307556f, 785, 67, 841.859863f, 67, 912);
     path.lineTo(67, 913);
     path.cubicTo(67, 917.388916f, 67.2243805f, 921.725769f, 67.662384f, 926);
     path.lineTo(322, 926);
     path.lineTo(322, 896.048035f);
     path.cubicTo(314.09201f, 833.437622f, 260.247131f, 785, 195, 785);
     path.close();
     SkPath pathB;
     pathB.setFillType(SkPath::kWinding_FillType);
     pathB.moveTo(195, 785);
     pathB.cubicTo(265.140167f, 785, 322, 842.307556f, 322, 913);
     pathB.cubicTo(322, 983.692444f, 265.140167f, 1041, 195, 1041);
     pathB.lineTo(194, 1041);
     pathB.cubicTo(123.85984f, 1041, 67, 983.692444f, 67, 913);
     pathB.cubicTo(67, 842.307556f, 123.85984f, 785, 194, 785);
     pathB.lineTo(195, 785);
     pathB.close();
     testPathOp(reporter, path, pathB, kIntersect_PathOp);
 }
 
+#define SKPS_WORKING 0
+#if SKPS_WORKING
 static void skpcarrot_is24(skiatest::Reporter* reporter) {
     SkPath path;
     path.setFillType(SkPath::kEvenOdd_FillType);
     path.moveTo(945, 597);
     path.quadTo(913.93396f, 597, 891.96698f, 618.96698f);
     path.quadTo(870, 640.93396f, 870, 672);
     path.quadTo(870, 703.06604f, 891.96698f, 725.03302f);
     path.quadTo(913.93396f, 747, 945, 747);
     path.quadTo(976.06604f, 747, 998.03302f, 725.03302f);
     path.quadTo(1020, 703.06604f, 1020, 672);
@@ skipping 246 matching lines @@
     path.moveTo(1, 6);
     path.cubicTo(0, 3, 6, 3, 5, 0);
     path.close();
     pathB.setFillType(SkPath::kEvenOdd_FillType);
     pathB.moveTo(3, 6);
     pathB.cubicTo(0, 5, 6, 1, 3, 0);
     pathB.close();
     testPathOp(reporter, path, pathB, kDifference_PathOp);
 }
 
-static void (*firstTest)(skiatest::Reporter* ) = 0;
+static void cubicOp97x(skiatest::Reporter* reporter) {
+    SkPath path, pathB;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(0, 2);
+    path.cubicTo(0, 6, 2, 1, 2, 1);
+    path.close();
+    pathB.setFillType(SkPath::kEvenOdd_FillType);
+    pathB.moveTo(1, 2);
+    pathB.cubicTo(1, 2, 2, 0, 6, 0);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kXOR_PathOp);
+}
+
+static void cubicOp98x(skiatest::Reporter* reporter) {
+    SkPath path, pathB;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(0, 3);
+    path.cubicTo(3, 6, 4, 1, 6, 3);
+    path.close();
+    pathB.setFillType(SkPath::kEvenOdd_FillType);
+    pathB.moveTo(1, 4);
+    pathB.cubicTo(3, 6, 3, 0, 6, 3);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kXOR_PathOp);
+}
+
+static void (*firstTest)(skiatest::Reporter* ) = bufferOverflow;
 
 static struct TestDesc tests[] = {
 #if ISSUE_1435_WORKING
     TEST(issue1435),
 #endif
 #if SKPS_WORKING
     TEST(skpcarrot_is24),
-    TEST(skpcarpetplanet_ru22),  // cubic/cubic intersect detects unwanted coincidence
 #endif
 #if ISSUE_1417_WORKING_ON_LINUX_32
     TEST(issue1417),
 #endif
+    TEST(cubicOp98x),
+    TEST(cubicOp97x),
+    TEST(skpcarpetplanet_ru22),  // cubic/cubic intersect detects unwanted coincidence
     TEST(cubicOp96d),
     TEST(cubicOp95u),
     TEST(skpadbox_lt15),
     TEST(skpagentxsites_com55),
     TEST(skpadventistmission_org572),
     TEST(skpadspert_net23),
     TEST(skpadoption_org196),
     TEST(skpbambootheme_com12),
     TEST(skpbakosoft_com10),
     TEST(skpakmmos_ru100),
@@ skipping 195 matching lines @@
         RunTestSet(reporter, subTests, subTestCount, firstSubTest, stopTest, runReverse);
     }
 #ifdef SK_DEBUG
     SkPathOpsDebug::gMaxWindSum = SK_MaxS32;
     SkPathOpsDebug::gMaxWindValue = SK_MaxS32;
 #endif
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS_SHORT(PathOpsOpTest)