diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-15 03:04:18 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-15 03:04:18 +0000 |
commit | a1ed7aec95eb8c77d1a39834fea476780007cade (patch) | |
tree | 1dc4e0a0d80de046c4e082973dd3c87d10e071a2 /tests | |
parent | 4bd8fdc04c143e3c43a0e48a5444da02cacf1803 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14196 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests')
-rw-r--r-- | tests/PathOpsAngleTest.cpp | 2 | ||||
-rw-r--r-- | tests/PathOpsCubicQuadIntersectionTest.cpp | 6 | ||||
-rw-r--r-- | tests/PathOpsSimplifyFailTest.cpp | 2 | ||||
-rw-r--r-- | tests/PathOpsSimplifyTest.cpp | 58 |
4 files changed, 34 insertions, 34 deletions
diff --git a/tests/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp index 7c50998e98..37973f8f33 100644 --- a/tests/PathOpsAngleTest.cpp +++ b/tests/PathOpsAngleTest.cpp @@ -600,7 +600,7 @@ static IntersectData intersectDataSet15[] = { // pathops_visualizer.htm:6580 { {{{490.435,879.407}, {405.593,909.436}}}, 2, 0.500554405, 1, {} }, // pathops_visualizer.htm:6538 { {{{447.967,894.438}, {448.007,894.424}, {448.014,894.422}}}, 3, 0, 1, {} }, // pathops_visualizer.htm:6538 { {{{490.435,879.407}, {405.593,909.436}}}, 2, 0.500554405, 0.500000273, {} }, // pathops_visualizer.htm:6538 -}; // +}; // static IntersectData intersectDataSet16[] = { // pathops_visualizer.htm:7419 { {{{1.000,4.000}, {4.000,5.000}, {3.000,2.000}, {6.000,3.000}}}, 4, 0.5, 0, {} }, // pathops_visualizer.htm:7377 diff --git a/tests/PathOpsCubicQuadIntersectionTest.cpp b/tests/PathOpsCubicQuadIntersectionTest.cpp index 3827ebd8b5..db895d400d 100644 --- a/tests/PathOpsCubicQuadIntersectionTest.cpp +++ b/tests/PathOpsCubicQuadIntersectionTest.cpp @@ -232,11 +232,11 @@ DEF_TEST(PathOpsCubicQuadSlop, reporter) { SkDebugf("cubic={{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}}" " quad={{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}}" " {{{%1.9g,%1.9g}, {%1.9g,%1.9g}}}" - " qT=%1.9g cT=%1.9g dist=%1.9g cross=%1.9g\n", + " qT=%1.9g cT=%1.9g dist=%1.9g cross=%1.9g\n", cubic[0].fX, cubic[0].fY, cubic[1].fX, cubic[1].fY, cubic[2].fX, cubic[2].fY, cubic[3].fX, cubic[3].fY, nearby[0].fX, nearby[0].fY, nearby[1].fX, nearby[1].fY, - nearby[2].fX, nearby[2].fY, + nearby[2].fX, nearby[2].fY, liner.pt(0).fX, liner.pt(0).fY, locals.pt(0).fX, locals.pt(0).fY, quadT, cubicT, dist.length(), qxc); #else @@ -249,7 +249,7 @@ DEF_TEST(PathOpsCubicQuadSlop, reporter) { cubic[0].fX, cubic[0].fY, cubic[1].fX, cubic[1].fY, cubic[2].fX, cubic[2].fY, cubic[3].fX, cubic[3].fY, nearby[0].fX, nearby[0].fY, nearby[1].fX, nearby[1].fY, - nearby[2].fX, nearby[2].fY, + nearby[2].fX, nearby[2].fY, liner.pt(0).fX, liner.pt(0).fY, locals.pt(0).fX, locals.pt(0).fY); SkDebugf("</div>\n\n"); diff --git a/tests/PathOpsSimplifyFailTest.cpp b/tests/PathOpsSimplifyFailTest.cpp index a38f826132..2a4b0a0025 100644 --- a/tests/PathOpsSimplifyFailTest.cpp +++ b/tests/PathOpsSimplifyFailTest.cpp @@ -87,7 +87,7 @@ static void dontFailOne(skiatest::Reporter* reporter, int index) { result.setFillType(SkPath::kWinding_FillType); bool success = Simplify(path, &result); // linux 32 debug fails test 13 because the quad is not treated as linear - // there's no error in the math that I can find -- it looks like a processor + // there's no error in the math that I can find -- it looks like a processor // or compiler bug -- so for now, allow either to work REPORTER_ASSERT(reporter, success || index == 13); REPORTER_ASSERT(reporter, result.getFillType() != SkPath::kWinding_FillType); diff --git a/tests/PathOpsSimplifyTest.cpp b/tests/PathOpsSimplifyTest.cpp index 0004b12eee..7ed82a0755 100644 --- a/tests/PathOpsSimplifyTest.cpp +++ b/tests/PathOpsSimplifyTest.cpp @@ -4142,8 +4142,8 @@ static void testQuads21(skiatest::Reporter* reporter, const char* filename) { path.moveTo(0, 0); path.lineTo(0, 0); path.quadTo(3, 0, 2, 3); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads22(skiatest::Reporter* reporter, const char* filename) { @@ -4155,8 +4155,8 @@ static void testQuads22(skiatest::Reporter* reporter, const char* filename) { path.moveTo(0, 0); path.lineTo(0, 0); path.quadTo(0, 1, 3, 2); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads23(skiatest::Reporter* reporter, const char* filename) { @@ -4168,8 +4168,8 @@ static void testQuads23(skiatest::Reporter* reporter, const char* filename) { path.moveTo(0, 0); path.lineTo(0, 0); path.quadTo(0, 1, 3, 2); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads24(skiatest::Reporter* reporter, const char* filename) { @@ -4181,8 +4181,8 @@ static void testQuads24(skiatest::Reporter* reporter, const char* filename) { path.moveTo(0, 1); path.lineTo(0, 1); path.quadTo(0, 2, 3, 3); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads25(skiatest::Reporter* reporter, const char* filename) { @@ -4194,8 +4194,8 @@ static void testQuads25(skiatest::Reporter* reporter, const char* filename) { path.moveTo(0, 0); path.lineTo(0, 0); path.quadTo(3, 0, 2, 3); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads26(skiatest::Reporter* reporter, const char* filename) { @@ -4207,8 +4207,8 @@ static void testQuads26(skiatest::Reporter* reporter, const char* filename) { path.moveTo(0, 0); path.lineTo(0, 0); path.quadTo(0, 1, 3, 2); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads27(skiatest::Reporter* reporter, const char* filename) { @@ -4220,8 +4220,8 @@ static void testQuads27(skiatest::Reporter* reporter, const char* filename) { path.moveTo(2, 0); path.lineTo(2, 0); path.quadTo(3, 0, 1, 3); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads28(skiatest::Reporter* reporter, const char* filename) { @@ -4233,8 +4233,8 @@ static void testQuads28(skiatest::Reporter* reporter, const char* filename) { path.moveTo(0, 0); path.lineTo(0, 0); path.quadTo(3, 0, 2, 3); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads29(skiatest::Reporter* reporter, const char* filename) { @@ -4246,8 +4246,8 @@ static void testQuads29(skiatest::Reporter* reporter, const char* filename) { path.moveTo(3, 0); path.lineTo(3, 0); path.quadTo(3, 1, 0, 2); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads30(skiatest::Reporter* reporter, const char* filename) { @@ -4260,8 +4260,8 @@ static void testQuads30(skiatest::Reporter* reporter, const char* filename) { path.moveTo(2, 0); path.lineTo(2, 0); path.quadTo(3, 2, 1, 3); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads31(skiatest::Reporter* reporter, const char* filename) { @@ -4274,8 +4274,8 @@ static void testQuads31(skiatest::Reporter* reporter, const char* filename) { path.lineTo(0, 1); path.quadTo(2, 1, 1, 3); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads32(skiatest::Reporter* reporter, const char* filename) { @@ -4287,8 +4287,8 @@ static void testQuads32(skiatest::Reporter* reporter, const char* filename) { path.moveTo(1, 1); path.lineTo(1, 1); path.quadTo(3, 1, 0, 3); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads33(skiatest::Reporter* reporter, const char* filename) { @@ -4300,8 +4300,8 @@ static void testQuads33(skiatest::Reporter* reporter, const char* filename) { path.moveTo(0, 0); path.lineTo(0, 0); path.quadTo(3, 0, 2, 3); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads34(skiatest::Reporter* reporter, const char* filename) { @@ -4313,8 +4313,8 @@ static void testQuads34(skiatest::Reporter* reporter, const char* filename) { path.moveTo(1, 0); path.lineTo(1, 0); path.quadTo(2, 0, 3, 3); - path.close(); - testSimplify(reporter, path, filename); + path.close(); + testSimplify(reporter, path, filename); } static void testQuads35(skiatest::Reporter* reporter, const char* filename) { @@ -4507,7 +4507,7 @@ static void testQuads47(skiatest::Reporter* reporter, const char* filename) { } // this fails because there is a short unorderable segment and the unordered state isn't handled -// correctly later on. +// correctly later on. static void testQuads46x(skiatest::Reporter* reporter, const char* filename) { SkPath path; path.setFillType(SkPath::kEvenOdd_FillType); |