Sanitizing source files in Housekeeper-Nightly

git-svn-id: http://skia.googlecode.com/svn/trunk@12101 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 177 insertions, 177 deletions

diff --git a/tests/PathOpsSkpTest.cpp b/tests/PathOpsSkpTest.cpp
index 7eb0a54ec3..6e7c7ace92 100755
--- a/tests/PathOpsSkpTest.cpp
+++ b/tests/PathOpsSkpTest.cpp
@@ -906,12 +906,12 @@ static void skpsd_graphic_net104(skiatest::Reporter* reporter) {
  only intersect at the shared point (430,280)
  they sort backwards because the tangent from pt[0] to control pt[1]
  c' = (0.00000000000000000, -1.1045837402343750)
- q' = (0.0097961425781250000, -2.8988037109375000)

- suggests that the quad is counterclockwise of the cubic, when the reverse is true

- the angle code is fooled because the control pt[1] of both the quad and cubic

- is far away from cubic cntl [2] and quad pt [2].

- Maybe in angle setup, this instability can be detected to suppress sorting on the initial tangent

- Or the error term can be passed to NearRay that is magnified by the distance from the next ctrl?

+ q' = (0.0097961425781250000, -2.8988037109375000)
+ suggests that the quad is counterclockwise of the cubic, when the reverse is true
+ the angle code is fooled because the control pt[1] of both the quad and cubic
+ is far away from cubic cntl [2] and quad pt [2].
+ Maybe in angle setup, this instability can be detected to suppress sorting on the initial tangent
+ Or the error term can be passed to NearRay that is magnified by the distance from the next ctrl?
  */
 static void skpnaoxrane_ru23(skiatest::Reporter* reporter) {
     SkPath path;
@@ -1371,183 +1371,183 @@ static void skpwww_briian_com_34(skiatest::Reporter* reporter) {
     testPathOp(reporter, path, pathB, kIntersect_PathOp);
 }
 
-

-static void skpwww_sciality_com_100(skiatest::Reporter* reporter) {

-    SkPath path;

-    path.setFillType(SkPath::kEvenOdd_FillType);

-    path.moveTo(162, 468);

-    path.cubicTo(159.790863f, 468, 158, 469.790863f, 158, 472);

-    path.lineTo(158, 528);

-    path.cubicTo(158, 530.209106f, 159.790863f, 532, 162, 532);

-    path.lineTo(275, 532);

-    path.cubicTo(277.209137f, 532, 279, 530.209106f, 279, 528);

-    path.lineTo(279, 472);

-    path.cubicTo(279, 469.790863f, 277.209137f, 468, 275, 468);

-    path.lineTo(162, 468);

-    path.close();

-    SkPath pathB;

-    pathB.setFillType(SkPath::kWinding_FillType);

-    pathB.moveTo(275, 468);

-    pathB.cubicTo(276.65686f, 468, 278, 469.34314f, 278, 471);

-    pathB.lineTo(278, 529);

-    pathB.cubicTo(278, 530.65686f, 276.65686f, 532, 275, 532);

-    pathB.lineTo(161, 532);

-    pathB.cubicTo(159.34314f, 532, 158, 530.65686f, 158, 529);

-    pathB.lineTo(158, 471);

-    pathB.cubicTo(158, 469.34314f, 159.34314f, 468, 161, 468);

-    pathB.lineTo(275, 468);

-    pathB.close();

-    testPathOp(reporter, path, pathB, kIntersect_PathOp);

-}

-

+
+static void skpwww_sciality_com_100(skiatest::Reporter* reporter) {
+    SkPath path;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(162, 468);
+    path.cubicTo(159.790863f, 468, 158, 469.790863f, 158, 472);
+    path.lineTo(158, 528);
+    path.cubicTo(158, 530.209106f, 159.790863f, 532, 162, 532);
+    path.lineTo(275, 532);
+    path.cubicTo(277.209137f, 532, 279, 530.209106f, 279, 528);
+    path.lineTo(279, 472);
+    path.cubicTo(279, 469.790863f, 277.209137f, 468, 275, 468);
+    path.lineTo(162, 468);
+    path.close();
+    SkPath pathB;
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(275, 468);
+    pathB.cubicTo(276.65686f, 468, 278, 469.34314f, 278, 471);
+    pathB.lineTo(278, 529);
+    pathB.cubicTo(278, 530.65686f, 276.65686f, 532, 275, 532);
+    pathB.lineTo(161, 532);
+    pathB.cubicTo(159.34314f, 532, 158, 530.65686f, 158, 529);
+    pathB.lineTo(158, 471);
+    pathB.cubicTo(158, 469.34314f, 159.34314f, 468, 161, 468);
+    pathB.lineTo(275, 468);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kIntersect_PathOp);
+}
+
 #if TRY_SEPT_BROKEN_TESTS
-static void skpwww_sciality_com_101(skiatest::Reporter* reporter) {

-    SkPath path;

-    path.setFillType(SkPath::kEvenOdd_FillType);

-    path.moveTo(162, 468);

-    path.cubicTo(159.790863f, 468, 158, 469.790863f, 158, 472);

-    path.lineTo(158, 528);

-    path.cubicTo(158, 530.209106f, 159.790863f, 532, 162, 532);

-    path.lineTo(275.009186f, 532);

-    path.cubicTo(276.661774f, 531.994995f, 278, 530.653748f, 278, 529);

-    path.lineTo(278, 471);

-    path.cubicTo(278, 469.346375f, 276.662079f, 468.005249f, 275.009705f, 468);

-    path.lineTo(162, 468);

-    path.close();

-    SkPath pathB;

-    pathB.setFillType(SkPath::kInverseWinding_FillType);

-    pathB.moveTo(161, 469);

-    pathB.lineTo(275, 469);

-    pathB.cubicTo(276.65686f, 469, 278, 469.895416f, 278, 471);

-    pathB.lineTo(278, 529);

-    pathB.cubicTo(278, 530.65686f, 276.65686f, 532, 275, 532);

-    pathB.lineTo(161, 532);

-    pathB.cubicTo(159.34314f, 532, 158, 530.65686f, 158, 529);

-    pathB.lineTo(158, 471);

-    pathB.cubicTo(158, 469.895416f, 159.34314f, 469, 161, 469);

-    pathB.close();

-    testPathOp(reporter, path, pathB, kIntersect_PathOp);

-}

+static void skpwww_sciality_com_101(skiatest::Reporter* reporter) {
+    SkPath path;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(162, 468);
+    path.cubicTo(159.790863f, 468, 158, 469.790863f, 158, 472);
+    path.lineTo(158, 528);
+    path.cubicTo(158, 530.209106f, 159.790863f, 532, 162, 532);
+    path.lineTo(275.009186f, 532);
+    path.cubicTo(276.661774f, 531.994995f, 278, 530.653748f, 278, 529);
+    path.lineTo(278, 471);
+    path.cubicTo(278, 469.346375f, 276.662079f, 468.005249f, 275.009705f, 468);
+    path.lineTo(162, 468);
+    path.close();
+    SkPath pathB;
+    pathB.setFillType(SkPath::kInverseWinding_FillType);
+    pathB.moveTo(161, 469);
+    pathB.lineTo(275, 469);
+    pathB.cubicTo(276.65686f, 469, 278, 469.895416f, 278, 471);
+    pathB.lineTo(278, 529);
+    pathB.cubicTo(278, 530.65686f, 276.65686f, 532, 275, 532);
+    pathB.lineTo(161, 532);
+    pathB.cubicTo(159.34314f, 532, 158, 530.65686f, 158, 529);
+    pathB.lineTo(158, 471);
+    pathB.cubicTo(158, 469.895416f, 159.34314f, 469, 161, 469);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kIntersect_PathOp);
+}
 #endif
 
-static void skpwww_meb_gov_tr_5(skiatest::Reporter* reporter) {

-    SkPath path;

-    path.setFillType(SkPath::kEvenOdd_FillType);

-    path.moveTo(137.34314f, 145.34314f);

-    path.quadTo(139.687088f, 143.000793f, 143, 143);

-    path.lineTo(242, 143);

-    path.quadTo(245.312912f, 143.000793f, 247.65686f, 145.34314f);

-    path.quadTo(249.999207f, 147.687088f, 250, 151);

-    path.lineTo(250, 177);

-    path.lineTo(135, 177);

-    path.lineTo(135, 151);

-    path.quadTo(135.000793f, 147.687088f, 137.34314f, 145.34314f);

-    path.close();

-    SkPath pathB;

-    pathB.setFillType(SkPath::kWinding_FillType);

-    pathB.moveTo(135, 143);

-    pathB.lineTo(250, 143);

-    pathB.lineTo(250, 177);

-    pathB.lineTo(135, 177);

-    pathB.close();

-    testPathOp(reporter, path, pathB, kIntersect_PathOp);

-}

-

+static void skpwww_meb_gov_tr_5(skiatest::Reporter* reporter) {
+    SkPath path;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(137.34314f, 145.34314f);
+    path.quadTo(139.687088f, 143.000793f, 143, 143);
+    path.lineTo(242, 143);
+    path.quadTo(245.312912f, 143.000793f, 247.65686f, 145.34314f);
+    path.quadTo(249.999207f, 147.687088f, 250, 151);
+    path.lineTo(250, 177);
+    path.lineTo(135, 177);
+    path.lineTo(135, 151);
+    path.quadTo(135.000793f, 147.687088f, 137.34314f, 145.34314f);
+    path.close();
+    SkPath pathB;
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(135, 143);
+    pathB.lineTo(250, 143);
+    pathB.lineTo(250, 177);
+    pathB.lineTo(135, 177);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kIntersect_PathOp);
+}
+
 #if TRY_SEPT_BROKEN_TESTS
-static void skpwww_meb_gov_tr_6(skiatest::Reporter* reporter) {

-    SkPath path;

-    path.setFillType(SkPath::kEvenOdd_FillType);

-    path.moveTo(143, 143);

-    path.quadTo(139.687088f, 143.000793f, 137.34314f, 145.34314f);

-    path.quadTo(135.000793f, 147.687088f, 135, 151);

-    path.lineTo(135, 177);

-    path.lineTo(250, 177);

-    path.lineTo(250, 151);

-    path.quadTo(249.999207f, 147.687088f, 247.65686f, 145.34314f);

-    path.quadTo(245.312912f, 143.000793f, 242, 143);

-    path.lineTo(143, 143);

-    path.close();

-    SkPath pathB;

-    pathB.setFillType(SkPath::kInverseWinding_FillType);

-    pathB.moveTo(143, 143);

-    pathB.lineTo(242, 143);

-    pathB.cubicTo(245.865997f, 143, 249, 146.581726f, 249, 151);

-    pathB.lineTo(249, 177);

-    pathB.lineTo(135, 177);

-    pathB.lineTo(135, 151);

-    pathB.cubicTo(135, 146.581726f, 138.581726f, 143, 143, 143);

-    pathB.close();

-    testPathOp(reporter, path, pathB, kIntersect_PathOp);

-}

+static void skpwww_meb_gov_tr_6(skiatest::Reporter* reporter) {
+    SkPath path;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(143, 143);
+    path.quadTo(139.687088f, 143.000793f, 137.34314f, 145.34314f);
+    path.quadTo(135.000793f, 147.687088f, 135, 151);
+    path.lineTo(135, 177);
+    path.lineTo(250, 177);
+    path.lineTo(250, 151);
+    path.quadTo(249.999207f, 147.687088f, 247.65686f, 145.34314f);
+    path.quadTo(245.312912f, 143.000793f, 242, 143);
+    path.lineTo(143, 143);
+    path.close();
+    SkPath pathB;
+    pathB.setFillType(SkPath::kInverseWinding_FillType);
+    pathB.moveTo(143, 143);
+    pathB.lineTo(242, 143);
+    pathB.cubicTo(245.865997f, 143, 249, 146.581726f, 249, 151);
+    pathB.lineTo(249, 177);
+    pathB.lineTo(135, 177);
+    pathB.lineTo(135, 151);
+    pathB.cubicTo(135, 146.581726f, 138.581726f, 143, 143, 143);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kIntersect_PathOp);
+}
 #endif
 
-static void skpgithub_io_25(skiatest::Reporter* reporter) {

-    SkPath path;

-    path.setFillType(SkPath::kEvenOdd_FillType);

-    path.moveTo(1001.87866f, 14.8786793f);

-    path.quadTo(1002.75745f, 14.0001001f, 1004, 14);

-    path.lineTo(1105, 14);

-    path.quadTo(1106.24255f, 14.0001001f, 1107.12134f, 14.8786793f);

-    path.quadTo(1107.99988f, 15.7574596f, 1108, 17);

-    path.lineTo(1108, 41);

-    path.quadTo(1107.99988f, 42.2425423f, 1107.12134f, 43.1213188f);

-    path.quadTo(1106.24255f, 43.9999008f, 1105, 44);

-    path.lineTo(1004, 44);

-    path.quadTo(1002.75745f, 43.9999008f, 1001.87866f, 43.1213188f);

-    path.quadTo(1001.00012f, 42.2425423f, 1001, 41);

-    path.lineTo(1001, 17);

-    path.quadTo(1001.00012f, 15.7574596f, 1001.87866f, 14.8786793f);

-    path.close();

-    SkPath pathB;

-    pathB.setFillType(SkPath::kInverseWinding_FillType);

-    pathB.moveTo(1005, 16);

-    pathB.lineTo(1104, 16);

-    pathB.cubicTo(1105.10461f, 16, 1106, 16.8954296f, 1106, 18);

-    pathB.lineTo(1106, 40);

-    pathB.cubicTo(1106, 41.1045685f, 1105.10461f, 42, 1104, 42);

-    pathB.lineTo(1005, 42);

-    pathB.cubicTo(1003.89545f, 42, 1003, 41.1045685f, 1003, 40);

-    pathB.lineTo(1003, 18);

-    pathB.cubicTo(1003, 16.8954296f, 1003.89545f, 16, 1005, 16);

-    pathB.close();

-    testPathOp(reporter, path, pathB, kIntersect_PathOp);

-}

-

-static void skpgithub_io_26(skiatest::Reporter* reporter) {

-    SkPath path;

-    path.setFillType(SkPath::kEvenOdd_FillType);

-    path.moveTo(1001.87866f, 14.8786793f);

-    path.quadTo(1002.75745f, 14.0001001f, 1004, 14);

-    path.lineTo(1105, 14);

-    path.quadTo(1106.24255f, 14.0001001f, 1107.12134f, 14.8786793f);

-    path.quadTo(1107.99988f, 15.7574596f, 1108, 17);

-    path.lineTo(1108, 41);

-    path.quadTo(1107.99988f, 42.2425423f, 1107.12134f, 43.1213188f);

-    path.quadTo(1106.24255f, 43.9999008f, 1105, 44);

-    path.lineTo(1004, 44);

-    path.quadTo(1002.75745f, 43.9999008f, 1001.87866f, 43.1213188f);

-    path.quadTo(1001.00012f, 42.2425423f, 1001, 41);

-    path.lineTo(1001, 17);

-    path.quadTo(1001.00012f, 15.7574596f, 1001.87866f, 14.8786793f);

-    path.close();

-    path.moveTo(1003, 18);

-    path.cubicTo(1003, 16.8954296f, 1003.89545f, 16, 1005, 16);

-    path.lineTo(1104, 16);

-    path.cubicTo(1105.10461f, 16, 1106, 16.8954296f, 1106, 18);

-    path.lineTo(1106, 40);

-    path.cubicTo(1106, 41.1045685f, 1105.10461f, 42, 1104, 42);

-    path.lineTo(1005, 42);

-    path.cubicTo(1003.89545f, 42, 1003, 41.1045685f, 1003, 40);

-    path.lineTo(1003, 18);

-    path.close();

-    SkPath pathB;

-    pathB.setFillType(SkPath::kWinding_FillType);

-    pathB.moveTo(1108, 14);

-    pathB.lineTo(1106, 16);

-    pathB.lineTo(1105.97998f, 46.0200005f);

-    pathB.lineTo(1108, 44);

-    testPathOp(reporter, path, pathB, kIntersect_PathOp);

-}

+static void skpgithub_io_25(skiatest::Reporter* reporter) {
+    SkPath path;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(1001.87866f, 14.8786793f);
+    path.quadTo(1002.75745f, 14.0001001f, 1004, 14);
+    path.lineTo(1105, 14);
+    path.quadTo(1106.24255f, 14.0001001f, 1107.12134f, 14.8786793f);
+    path.quadTo(1107.99988f, 15.7574596f, 1108, 17);
+    path.lineTo(1108, 41);
+    path.quadTo(1107.99988f, 42.2425423f, 1107.12134f, 43.1213188f);
+    path.quadTo(1106.24255f, 43.9999008f, 1105, 44);
+    path.lineTo(1004, 44);
+    path.quadTo(1002.75745f, 43.9999008f, 1001.87866f, 43.1213188f);
+    path.quadTo(1001.00012f, 42.2425423f, 1001, 41);
+    path.lineTo(1001, 17);
+    path.quadTo(1001.00012f, 15.7574596f, 1001.87866f, 14.8786793f);
+    path.close();
+    SkPath pathB;
+    pathB.setFillType(SkPath::kInverseWinding_FillType);
+    pathB.moveTo(1005, 16);
+    pathB.lineTo(1104, 16);
+    pathB.cubicTo(1105.10461f, 16, 1106, 16.8954296f, 1106, 18);
+    pathB.lineTo(1106, 40);
+    pathB.cubicTo(1106, 41.1045685f, 1105.10461f, 42, 1104, 42);
+    pathB.lineTo(1005, 42);
+    pathB.cubicTo(1003.89545f, 42, 1003, 41.1045685f, 1003, 40);
+    pathB.lineTo(1003, 18);
+    pathB.cubicTo(1003, 16.8954296f, 1003.89545f, 16, 1005, 16);
+    pathB.close();
+    testPathOp(reporter, path, pathB, kIntersect_PathOp);
+}
+
+static void skpgithub_io_26(skiatest::Reporter* reporter) {
+    SkPath path;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(1001.87866f, 14.8786793f);
+    path.quadTo(1002.75745f, 14.0001001f, 1004, 14);
+    path.lineTo(1105, 14);
+    path.quadTo(1106.24255f, 14.0001001f, 1107.12134f, 14.8786793f);
+    path.quadTo(1107.99988f, 15.7574596f, 1108, 17);
+    path.lineTo(1108, 41);
+    path.quadTo(1107.99988f, 42.2425423f, 1107.12134f, 43.1213188f);
+    path.quadTo(1106.24255f, 43.9999008f, 1105, 44);
+    path.lineTo(1004, 44);
+    path.quadTo(1002.75745f, 43.9999008f, 1001.87866f, 43.1213188f);
+    path.quadTo(1001.00012f, 42.2425423f, 1001, 41);
+    path.lineTo(1001, 17);
+    path.quadTo(1001.00012f, 15.7574596f, 1001.87866f, 14.8786793f);
+    path.close();
+    path.moveTo(1003, 18);
+    path.cubicTo(1003, 16.8954296f, 1003.89545f, 16, 1005, 16);
+    path.lineTo(1104, 16);
+    path.cubicTo(1105.10461f, 16, 1106, 16.8954296f, 1106, 18);
+    path.lineTo(1106, 40);
+    path.cubicTo(1106, 41.1045685f, 1105.10461f, 42, 1104, 42);
+    path.lineTo(1005, 42);
+    path.cubicTo(1003.89545f, 42, 1003, 41.1045685f, 1003, 40);
+    path.lineTo(1003, 18);
+    path.close();
+    SkPath pathB;
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(1108, 14);
+    pathB.lineTo(1106, 16);
+    pathB.lineTo(1105.97998f, 46.0200005f);
+    pathB.lineTo(1108, 44);
+    testPathOp(reporter, path, pathB, kIntersect_PathOp);
+}
 
 static void (*firstTest)(skiatest::Reporter* ) = 0;