fix minor skp-found bugs

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 3239 matching lines @@
     path.moveTo(0,1);
     path.cubicTo(1,6, 5,0, 2,1);
     path.close();
     pathB.setFillType(SkPath::kWinding_FillType);
     pathB.moveTo(0,5);
     pathB.cubicTo(1,2, 1,0, 6,1);
     pathB.close();
     testPathOp(reporter, path, pathB, kDifference_PathOp, filename);
 }
 
+// triggers addSimpleAngle with non-zero argument
+static void cubicOp112(skiatest::Reporter* reporter, const char* filename) {
+    SkPath path, pathB;
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(2,4);
+    path.cubicTo(2,3, 6,4, 1,0);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(4,6);
+    pathB.cubicTo(0,1, 4,2, 3,2);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kDifference_PathOp, filename);
+}
+
+// triggers untested calcLoopSpanCount code path
+#if 0
+static void cubicOp113(skiatest::Reporter* reporter, const char* filename) {
+    SkPath path, pathB;
+    path.moveTo(2,4);
+    path.cubicTo(3,5, 2.33333325f,4.33333349f, 3.83333325f,3.83333349f);
+    path.close();
+    pathB.moveTo(3,5);
+    pathB.cubicTo(2.33333325f,4.33333349f, 3.83333325f,3.83333349f, 2,4);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kDifference_PathOp, filename);
+}
+#endif
+
+static void cubicOp114(skiatest::Reporter* reporter, const char* filename) {
+    SkPath path, pathB;
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0, 1);
+    path.cubicTo(1, 3, -1, 2, 3.5f, 1.33333337f);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(1, 3);
+    pathB.cubicTo(-1, 2, 3.5f, 1.33333337f, 0, 1);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kIntersect_PathOp, filename);
+}
+
+static void quadOp10i(skiatest::Reporter* reporter, const char* filename) {
+    SkPath path, pathB;
+    path.moveTo(0, 0);
+    path.quadTo(1, 8, 3, 5);
+    path.lineTo(8, 1);
+    path.close();
+    pathB.moveTo(0, 0);
+    pathB.quadTo(8, 1, 4, 8);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kIntersect_PathOp, filename);
+}
+
 static void (*firstTest)(skiatest::Reporter* , const char* filename) = 0;
 static void (*stopTest)(skiatest::Reporter* , const char* filename) = 0;
 
 static struct TestDesc tests[] = {
+    TEST(quadOp10i),
+#if 0  // FIXME: serpentine curve is ordered the wrong way
+    TEST(cubicOp114),
+#endif
+#if 0  // FIXME: currently failing
+    TEST(cubicOp113),
+#endif
 #if SKPS_WORKING
     // fails because a cubic/quadratic intersection is missed
     // the internal quad/quad is far enough away from the real cubic/quad that it is rejected
     TEST(skpcarrot_is24),
 #endif
 #if ISSUE_1417_WORKING_ON_LINUX_32
     TEST(issue1417),
 #endif
+    TEST(cubicOp112),
     TEST(skpadspert_net23),
     TEST(skpadspert_de11),
     TEST(findFirst1),
     TEST(xOp2i),
     TEST(xOp3i),
     TEST(xOp1u),
     TEST(xOp1i),
     TEST(cubicOp111),
     TEST(cubicOp110),
     TEST(cubicOp109),
@@ skipping 178 matching lines @@
     TEST(cubicOp6d),
     TEST(cubicOp5d),
     TEST(cubicOp3d),
     TEST(cubicOp2d),
     TEST(cubicOp1d),
 };
 
 static const size_t testCount = SK_ARRAY_COUNT(tests);
 
 static struct TestDesc subTests[] = {
-    TEST(cubicOp6d),
-    TEST(cubicOp8d),
-    TEST(cubicOp70d),
-    TEST(cubicOp16d),
-    TEST(skp5),
+    TEST(cubicOp114),
+    TEST(cubicOp58d),
+    TEST(cubicOp53d),
 };
 
 static const size_t subTestCount = SK_ARRAY_COUNT(subTests);
 
 static void (*firstSubTest)(skiatest::Reporter* , const char* filename) = 0;
 
 static bool runSubTests = false;
 static bool runSubTestsFirst = false;
 static bool runReverse = false;
 
 DEF_TEST(PathOpsOp, reporter) {
-#ifdef SK_DEBUG
-    SkPathOpsDebug::gMaxWindSum = 4;
-    SkPathOpsDebug::gMaxWindValue = 4;
-#endif
 #if DEBUG_SHOW_TEST_NAME
     strncpy(DEBUG_FILENAME_STRING, "", DEBUG_FILENAME_STRING_LENGTH);
 #endif
     if (runSubTests && runSubTestsFirst) {
         RunTestSet(reporter, subTests, subTestCount, firstSubTest, stopTest, runReverse);
     }
     RunTestSet(reporter, tests, testCount, firstTest, stopTest, runReverse);
     if (runSubTests && !runSubTestsFirst) {
         RunTestSet(reporter, subTests, subTestCount, firstSubTest, stopTest, runReverse);
     }
-#ifdef SK_DEBUG
-    SkPathOpsDebug::gMaxWindSum = SK_MaxS32;
-    SkPathOpsDebug::gMaxWindValue = SK_MaxS32;
-#endif
 }
 
 static void bufferOverflow(skiatest::Reporter* reporter, const char* filename) {
     SkPath path;
     path.addRect(0,0, 300,170141183460469231731687303715884105728.f);
     SkPath pathB;
     pathB.addRect(0,0, 300,16);
     testPathFailOp(reporter, path, pathB, kUnion_PathOp, filename);
 }
 
 static struct TestDesc failTests[] = {
     TEST(bufferOverflow),
 };
 
 static const size_t failTestCount = SK_ARRAY_COUNT(failTests);
 
 DEF_TEST(PathOpsFailOp, reporter) {
-#ifdef SK_DEBUG
-    SkPathOpsDebug::gMaxWindSum = 4;
-    SkPathOpsDebug::gMaxWindValue = 4;
-#endif
 #if DEBUG_SHOW_TEST_NAME
     strncpy(DEBUG_FILENAME_STRING, "", DEBUG_FILENAME_STRING_LENGTH);
 #endif
     RunTestSet(reporter, failTests, failTestCount, 0, 0, false);
 }