From 15dd300ac6d7695b4d2aca81d8f3648eae704451 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 18 Jan 2013 07:07:28 +0000 Subject: [PATCH] Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk@7268 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/TileBench.cpp | 4 ++-- experimental/Intersection/CubicIntersection.cpp | 2 +- experimental/Intersection/CubicIntersection_Test.cpp | 4 ++-- experimental/Intersection/DataTypes.h | 2 +- experimental/Intersection/Intersections.h | 2 +- experimental/Intersection/QuadraticImplicit.cpp | 8 ++++---- experimental/Intersection/QuadraticUtilities.h | 2 +- experimental/Intersection/Simplify.cpp | 2 +- experimental/Intersection/SimplifyNew_Test.cpp | 2 +- src/core/SkPath.cpp | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bench/TileBench.cpp b/bench/TileBench.cpp index 661be9a..41d1929 100644 --- a/bench/TileBench.cpp +++ b/bench/TileBench.cpp @@ -38,11 +38,11 @@ class ConstXTileBench : public SkBenchmark { static const int kHeight = 300; public: - ConstXTileBench(void* param, + ConstXTileBench(void* param, SkShader::TileMode xTile, SkShader::TileMode yTile, bool doFilter, - bool doTrans) + bool doTrans) : INHERITED(param) , fDoFilter(doFilter) , fDoTrans(doTrans) { diff --git a/experimental/Intersection/CubicIntersection.cpp b/experimental/Intersection/CubicIntersection.cpp index d5a5bde..be3e088 100644 --- a/experimental/Intersection/CubicIntersection.cpp +++ b/experimental/Intersection/CubicIntersection.cpp @@ -164,7 +164,7 @@ bool intersect(const Cubic& c1, const Cubic& c2, Intersections& i) { // this flavor approximates the cubics with quads to find the intersecting ts // OPTIMIZE: if this strategy proves successful, the quad approximations, or the ts used // to create the approximations, could be stored in the cubic segment -// fixme: this strategy needs to add short line segments on either end, or similarly extend the +// fixme: this strategy needs to add short line segments on either end, or similarly extend the // initial and final quadratics bool intersect2(const Cubic& c1, const Cubic& c2, Intersections& i) { SkTDArray ts1; diff --git a/experimental/Intersection/CubicIntersection_Test.cpp b/experimental/Intersection/CubicIntersection_Test.cpp index 7d27bf4..6103108 100644 --- a/experimental/Intersection/CubicIntersection_Test.cpp +++ b/experimental/Intersection/CubicIntersection_Test.cpp @@ -62,7 +62,7 @@ static void oneOff(const Cubic& cubic1, const Cubic& cubic2) { cubic_to_quadratics(cubic1, calcPrecision(cubic1), quads1); for (int index = 0; index < quads1.count(); ++index) { const Quadratic& q = quads1[index]; - SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", q[0].x, q[0].y, + SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", q[0].x, q[0].y, q[1].x, q[1].y, q[2].x, q[2].y); } SkDebugf("\n"); @@ -70,7 +70,7 @@ static void oneOff(const Cubic& cubic1, const Cubic& cubic2) { cubic_to_quadratics(cubic2, calcPrecision(cubic2), quads2); for (int index = 0; index < quads2.count(); ++index) { const Quadratic& q = quads2[index]; - SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", q[0].x, q[0].y, + SkDebugf("{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", q[0].x, q[0].y, q[1].x, q[1].y, q[2].x, q[2].y); } SkDebugf("\n"); diff --git a/experimental/Intersection/DataTypes.h b/experimental/Intersection/DataTypes.h index 56931d4..84c3b66 100644 --- a/experimental/Intersection/DataTypes.h +++ b/experimental/Intersection/DataTypes.h @@ -155,7 +155,7 @@ struct _Point { return AlmostEqualUlps((float) x, (float) a.x) && AlmostEqualUlps((float) y, (float) a.y); } - + double dot(const _Point& a) { return x * a.x + y * a.y; } diff --git a/experimental/Intersection/Intersections.h b/experimental/Intersection/Intersections.h index 618c2c1..c8a142a 100644 --- a/experimental/Intersection/Intersections.h +++ b/experimental/Intersection/Intersections.h @@ -85,7 +85,7 @@ public: void swap() { fSwap ^= true; } - + void swapPts() { int index; for (index = 0; index < fUsed; ++index) { diff --git a/experimental/Intersection/QuadraticImplicit.cpp b/experimental/Intersection/QuadraticImplicit.cpp index 72a4186..6e46557 100644 --- a/experimental/Intersection/QuadraticImplicit.cpp +++ b/experimental/Intersection/QuadraticImplicit.cpp @@ -21,7 +21,7 @@ * then * 0 = A(at^2+bt+c)(at^2+bt+c)+B(at^2+bt+c)(dt^2+et+f)+C(dt^2+et+f)(dt^2+et+f)+D(at^2+bt+c)+E(dt^2+et+f)+F */ - + #if SK_DEBUG #define QUARTIC_DEBUG 1 #else @@ -160,7 +160,7 @@ static bool pointInTriangle(const _Point& pt, const _Line* testLines[]) { const _Point& B = (*testLines[1])[0]; const _Point& C = (*testLines[2])[0]; -// Compute vectors +// Compute vectors _Point v0 = C - A; _Point v1 = B - A; _Point v2 = pt - A; @@ -243,7 +243,7 @@ static bool isLinearInner(const Quadratic& q1, double t1s, double t1e, const Qua bool startInTriangle = pointInTriangle(end, testLines); if (startInTriangle) { tMin = t2s; - } + } xy_at_t(q2, t2e, end.x, end.y); bool endInTriangle = pointInTriangle(end, testLines); if (endInTriangle) { @@ -261,7 +261,7 @@ static bool isLinearInner(const Quadratic& q1, double t1s, double t1e, const Qua break; } } - + } if (split == 0) { // there's one point if (addIntercept(q1, q2, tMin, tMax, i)) { diff --git a/experimental/Intersection/QuadraticUtilities.h b/experimental/Intersection/QuadraticUtilities.h index 3230e9b..e2f94e7 100644 --- a/experimental/Intersection/QuadraticUtilities.h +++ b/experimental/Intersection/QuadraticUtilities.h @@ -4,7 +4,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - + #if !defined QUADRATIC_UTILITIES_H #define QUADRATIC_UTILITIES_H diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp index 5fd0fd5..19390fb 100644 --- a/experimental/Intersection/Simplify.cpp +++ b/experimental/Intersection/Simplify.cpp @@ -1678,7 +1678,7 @@ public: other.addCancelOutsides(tStart, oStart, *this, endT); } } - + int addUnsortableT(double newT, Segment* other, bool start) { int result = addT(newT, other); Span* span = &fTs[result]; diff --git a/experimental/Intersection/SimplifyNew_Test.cpp b/experimental/Intersection/SimplifyNew_Test.cpp index b6cc26e..823693c 100644 --- a/experimental/Intersection/SimplifyNew_Test.cpp +++ b/experimental/Intersection/SimplifyNew_Test.cpp @@ -4032,7 +4032,7 @@ static void testOp8d() { pathB.cubicTo(10.7082f, -116.596f, 262.057f, 45.6468f, 294.694f, 1.96237f); pathB.close(); testShapeOp(path, pathB, kDifference_Op); -} +} static const size_t testCount = sizeof(tests) / sizeof(tests[0]); diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp index 66908d8..c3ddf60 100644 --- a/src/core/SkPath.cpp +++ b/src/core/SkPath.cpp @@ -2121,7 +2121,7 @@ static void append_params(SkString* str, const char label[], const SkPoint pts[] int count) { str->append(label); str->append("("); - + const SkScalar* values = &pts[0].fX; count *= 2; -- 2.7.4