turn off debugging printfs

tests/PathOpsQuadIntersectionTest.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 "PathOpsQuadIntersectionTestData.h"
 #include "PathOpsTestCommon.h"
 #include "SkIntersections.h"
 #include "SkPathOpsRect.h"
@@ skipping 19 matching lines @@
             if (showSkipped) {
                 SkDebugf("[%d] quad2 order=%d\n", static_cast<int>(index), order2);
             }
         }
         if (order1 == 3 && order2 == 3) {
             SkIntersections intersections;
             intersections.intersect(quad1, quad2);
             if (intersections.used() > 0) {
                 for (int pt = 0; pt < intersections.used(); ++pt) {
                     double tt1 = intersections[0][pt];
-                    SkDPoint xy1 = quad1.xyAtT(tt1);
+                    SkDPoint xy1 = quad1.ptAtT(tt1);
                     double tt2 = intersections[1][pt];
-                    SkDPoint xy2 = quad2.xyAtT(tt2);
+                    SkDPoint xy2 = quad2.ptAtT(tt2);
                     if (!xy1.approximatelyEqual(xy2)) {
                         SkDebugf("%s [%d,%d] x!= t1=%g (%g,%g) t2=%g (%g,%g)\n",
                                 __FUNCTION__, static_cast<int>(index), pt, tt1, xy1.fX, xy1.fY,
                                 tt2, xy2.fX, xy2.fY);
                         REPORTER_ASSERT(reporter, 0);
                     }
                 }
             }
         }
     }
@@ skipping 196 matching lines @@
 
 static void oneOffTest1(skiatest::Reporter* reporter, size_t outer, size_t inner) {
     const SkDQuad& quad1 = testSet[outer];
     SkASSERT(ValidQuad(quad1));
     const SkDQuad& quad2 = testSet[inner];
     SkASSERT(ValidQuad(quad2));
     SkIntersections intersections2;
     intersections2.intersect(quad1, quad2);
     for (int pt = 0; pt < intersections2.used(); ++pt) {
         double tt1 = intersections2[0][pt];
-        SkDPoint xy1 = quad1.xyAtT(tt1);
+        SkDPoint xy1 = quad1.ptAtT(tt1);
         double tt2 = intersections2[1][pt];
-        SkDPoint xy2 = quad2.xyAtT(tt2);
+        SkDPoint xy2 = quad2.ptAtT(tt2);
         if (!xy1.approximatelyEqual(xy2)) {
             SkDebugf("%s [%d,%d] x!= t1=%g (%g,%g) t2=%g (%g,%g)\n",
                     __FUNCTION__, static_cast<int>(outer), static_cast<int>(inner),
                     tt1, xy1.fX, xy1.fY, tt2, xy2.fX, xy2.fY);
             REPORTER_ASSERT(reporter, 0);
         }
 #if ONE_OFF_DEBUG
         SkDebugf("%s [%d][%d] t1=%1.9g (%1.9g, %1.9g) t2=%1.9g\n", __FUNCTION__,
             outer, inner, tt1, xy1.fX, xy1.fY, tt2);
 #endif
     }
 }
 
 static void PathOpsQuadIntersectionOneOffTest(skiatest::Reporter* reporter) {
     oneOffTest1(reporter, 0, 1);
 }
 
 static void oneOffTests(skiatest::Reporter* reporter) {
     for (size_t outer = 0; outer < testSetCount - 1; ++outer) {
         for (size_t inner = outer + 1; inner < testSetCount; ++inner) {
             oneOffTest1(reporter, outer, inner);
         }
     }
 }
 
 static const SkDQuad coincidentTestSet[] = {
+    {{{97.9337615966796875,100}, {88,112.94264984130859375}, {88,130}}},
+    {{{88,130}, {88,124.80951690673828125}, {88.91983795166015625,120}}},
     {{{369.850525, 145.675964}, {382.362915, 121.29287}, {406.211273, 121.29287}}},
     {{{369.850525, 145.675964}, {382.362915, 121.29287}, {406.211273, 121.29287}}},
     {{{8, 8}, {10, 10}, {8, -10}}},
     {{{8, -10}, {10, 10}, {8, 8}}},
 };
 
 const size_t coincidentTestSetCount = SK_ARRAY_COUNT(coincidentTestSet);
 
+static void coincidentTestOne(skiatest::Reporter* reporter, int test1, int test2) {
+    const SkDQuad& quad1 = coincidentTestSet[test1];
+    SkASSERT(ValidQuad(quad1));
+    const SkDQuad& quad2 = coincidentTestSet[test2];
+    SkASSERT(ValidQuad(quad2));
+    SkIntersections intersections2;
+    intersections2.intersect(quad1, quad2);
+    REPORTER_ASSERT(reporter, intersections2.coincidentUsed() == 2);
+    REPORTER_ASSERT(reporter, intersections2.used() == 2);
+    for (int pt = 0; pt < intersections2.coincidentUsed(); ++pt) {
+        double tt1 = intersections2[0][pt];
+        double tt2 = intersections2[1][pt];
+        SkDPoint pt1 = quad1.ptAtT(tt1);
+        SkDPoint pt2 = quad2.ptAtT(tt2);
+        REPORTER_ASSERT(reporter, pt1.approximatelyEqual(pt2));
+    }
+}
+
 static void coincidentTest(skiatest::Reporter* reporter) {
     for (size_t testIndex = 0; testIndex < coincidentTestSetCount - 1; testIndex += 2) {
-        const SkDQuad& quad1 = coincidentTestSet[testIndex];
-        SkASSERT(ValidQuad(quad1));
-        const SkDQuad& quad2 = coincidentTestSet[testIndex + 1];
-        SkASSERT(ValidQuad(quad2));
-        SkIntersections intersections2;
-        intersections2.intersect(quad1, quad2);
-        REPORTER_ASSERT(reporter, intersections2.coincidentUsed() == 2);
-        REPORTER_ASSERT(reporter, intersections2.used() == 2);
-        for (int pt = 0; pt < intersections2.coincidentUsed(); ++pt) {
-            double tt1 = intersections2[0][pt];
-            double tt2 = intersections2[1][pt];
-            REPORTER_ASSERT(reporter, approximately_equal(1, tt1) || approximately_zero(tt1));
-            REPORTER_ASSERT(reporter, approximately_equal(1, tt2) || approximately_zero(tt2));
-        }
+        coincidentTestOne(reporter, testIndex, testIndex + 1);
     }
 }
 
+static void PathOpsQuadIntersectionCoincidenceOneOffTest(skiatest::Reporter* reporter) {
+    coincidentTestOne(reporter, 0, 1);
+}
+
 static int floatSign(double x) {
     return x < 0 ? -1 : x > 0 ? 1 : 0;
 }
 
 static const SkDQuad pointFinderTestSet[] = {
                                                                                                                                 //>=0.633974464         0.633974846 <=
 {{{1.2071879545809394, 0.82163474041730045}, {1.1534203513372994, 0.52790870069930229},
         {1.0880000000000001, 0.29599999999999982}}},  //t=0.63155333662549329, 0.80000000000000004
 {{{1.2071879545809394, 0.82163474041730045}, {1.2065040319428038, 0.81766753259119995},
         {1.2058123269101506, 0.81370135061854221}}},  //t=0.63155333662549329, 0.6339049773632347
 {{{1.2058123269101506, 0.81370135061854221}, {1.152376363978022, 0.5244097415381026},
         {1.0880000000000001, 0.29599999999999982}}},  //t=0.6339049773632347,  0.80000000000000004
                                                                                                                                 //>=0.633974083         0.633975227 <=
 {{{0.33333333333333326, 0.81481481481481488}, {0.63395173631977997, 0.68744136726313931},
         {1.205684411948591, 0.81344322326274499}}},   //t=0.33333333333333331, 0.63395173631977986
 {{{0.33333333333333326, 0.81481481481481488}, {0.63396444791444551, 0.68743368362444768},
         {1.205732763658403, 0.81345617746834109}}},   //t=0.33333333333333331, 0.63396444791444551
 {{{1.205684411948591, 0.81344322326274499}, {1.2057085875611198, 0.81344969999329253},
         {1.205732763658403, 0.81345617746834109}}},   //t=0.63395173631977986, 0.63396444791444551
 {{{1.205732763658403, 0.81345617746834109}, {1.267928895828891, 0.83008534558465619},
         {1.3333333333333333, 0.85185185185185175}}},  //t=0.63396444791444551, 0.66666666666666663
 };
 
 static void pointFinder(const SkDQuad& q1, const SkDQuad& q2) {
     for (int index = 0; index < 3; ++index) {
         double t = q1.nearestT(q2[index]);
-        SkDPoint onQuad = q1.xyAtT(t);
+        SkDPoint onQuad = q1.ptAtT(t);
         SkDebugf("%s t=%1.9g (%1.9g,%1.9g) dist=%1.9g\n", __FUNCTION__, t, onQuad.fX, onQuad.fY,
                 onQuad.distance(q2[index]));
         double left[3];
         left[0] = ((const SkDLine&) q1[0]).isLeft(q2[index]);
         left[1] = ((const SkDLine&) q1[1]).isLeft(q2[index]);
         SkDLine diag = {{q1[0], q1[2]}};
         left[2] = diag.isLeft(q2[index]);
         SkDebugf("%s left=(%d, %d, %d) inHull=%s\n", __FUNCTION__, floatSign(left[0]),
                 floatSign(left[1]), floatSign(left[2]),
                 q1.pointInHull(q2[index]) ? "true" : "false");
@@ skipping 29 matching lines @@
     const SkDQuad& quad1 = testSet[test1];
     const SkDQuad& quad2 = testSet[test2];
 
     double t1Seed = 0.5;
     double t2Seed = 0.8;
     double t1Step = 0.1;
     double t2Step = 0.1;
     SkDPoint t1[3], t2[3];
     bool toggle = true;
     do {
-        t1[0] = quad1.xyAtT(t1Seed - t1Step);
-        t1[1] = quad1.xyAtT(t1Seed);
-        t1[2] = quad1.xyAtT(t1Seed + t1Step);
-        t2[0] = quad2.xyAtT(t2Seed - t2Step);
-        t2[1] = quad2.xyAtT(t2Seed);
-        t2[2] = quad2.xyAtT(t2Seed + t2Step);
+        t1[0] = quad1.ptAtT(t1Seed - t1Step);
+        t1[1] = quad1.ptAtT(t1Seed);
+        t1[2] = quad1.ptAtT(t1Seed + t1Step);
+        t2[0] = quad2.ptAtT(t2Seed - t2Step);
+        t2[1] = quad2.ptAtT(t2Seed);
+        t2[2] = quad2.ptAtT(t2Seed + t2Step);
         double dist[3][3];
         dist[1][1] = t1[1].distance(t2[1]);
         int best_i = 1, best_j = 1;
         for (int i = 0; i < 3; ++i) {
             for (int j = 0; j < 3; ++j) {
                 if (i == 1 && j == 1) {
                     continue;
                 }
                 dist[i][j] = t1[i].distance(t2[j]);
                 if (dist[best_i][best_j] > dist[i][j]) {
@@ skipping 20 matching lines @@
             }
         }
     } while (!t1[1].approximatelyEqual(t2[1]));
     t1Step = t2Step = 0.1;
     double t10 = t1Seed - t1Step * 2;
     double t12 = t1Seed + t1Step * 2;
     double t20 = t2Seed - t2Step * 2;
     double t22 = t2Seed + t2Step * 2;
     SkDPoint test;
     while (!approximately_zero(t1Step)) {
-        test = quad1.xyAtT(t10);
+        test = quad1.ptAtT(t10);
         t10 += t1[1].approximatelyEqual(test) ? -t1Step : t1Step;
         t1Step /= 2;
     }
     t1Step = 0.1;
     while (!approximately_zero(t1Step)) {
-        test = quad1.xyAtT(t12);
+        test = quad1.ptAtT(t12);
         t12 -= t1[1].approximatelyEqual(test) ? -t1Step : t1Step;
         t1Step /= 2;
     }
     while (!approximately_zero(t2Step)) {
-        test = quad2.xyAtT(t20);
+        test = quad2.ptAtT(t20);
         t20 += t2[1].approximatelyEqual(test) ? -t2Step : t2Step;
         t2Step /= 2;
     }
     t2Step = 0.1;
     while (!approximately_zero(t2Step)) {
-        test = quad2.xyAtT(t22);
+        test = quad2.ptAtT(t22);
         t22 -= t2[1].approximatelyEqual(test) ? -t2Step : t2Step;
         t2Step /= 2;
     }
 #if ONE_OFF_DEBUG
     SkDebugf("%s t1=(%1.9g<%1.9g<%1.9g) t2=(%1.9g<%1.9g<%1.9g)\n", __FUNCTION__,
         t10, t1Seed, t12, t20, t2Seed, t22);
-    SkDPoint p10 = quad1.xyAtT(t10);
-    SkDPoint p1Seed = quad1.xyAtT(t1Seed);
-    SkDPoint p12 = quad1.xyAtT(t12);
+    SkDPoint p10 = quad1.ptAtT(t10);
+    SkDPoint p1Seed = quad1.ptAtT(t1Seed);
+    SkDPoint p12 = quad1.ptAtT(t12);
     SkDebugf("%s p1=(%1.9g,%1.9g)<(%1.9g,%1.9g)<(%1.9g,%1.9g)\n", __FUNCTION__,
         p10.fX, p10.fY, p1Seed.fX, p1Seed.fY, p12.fX, p12.fY);
-    SkDPoint p20 = quad2.xyAtT(t20);
-    SkDPoint p2Seed = quad2.xyAtT(t2Seed);
-    SkDPoint p22 = quad2.xyAtT(t22);
+    SkDPoint p20 = quad2.ptAtT(t20);
+    SkDPoint p2Seed = quad2.ptAtT(t2Seed);
+    SkDPoint p22 = quad2.ptAtT(t22);
     SkDebugf("%s p2=(%1.9g,%1.9g)<(%1.9g,%1.9g)<(%1.9g,%1.9g)\n", __FUNCTION__,
         p20.fX, p20.fY, p2Seed.fX, p2Seed.fY, p22.fX, p22.fY);
 #endif
 }
 
 static void QuadraticIntersection_IntersectionFinder() {
     intersectionFinder(0, 1);
 }
 
 static void PathOpsQuadIntersectionTest(skiatest::Reporter* reporter) {
     oneOffTests(reporter);
     coincidentTest(reporter);
     standardTestCases(reporter);
     if (false) QuadraticIntersection_IntersectionFinder();
     if (false) QuadraticIntersection_PointFinder();
 }
 
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS_SHORT(PathOpsQuadIntersectionTest)
 
 DEFINE_TESTCLASS_SHORT(PathOpsQuadIntersectionOneOffTest)
+
+DEFINE_TESTCLASS_SHORT(PathOpsQuadIntersectionCoincidenceOneOffTest)