diff options
-rw-r--r-- | experimental/Intersection/CubicIntersection.cpp | 12 | ||||
-rw-r--r-- | experimental/Intersection/TriangleUtilities.cpp | 1 | ||||
-rw-r--r-- | tools/PictureBenchmark.cpp | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/experimental/Intersection/CubicIntersection.cpp b/experimental/Intersection/CubicIntersection.cpp index e5a2c18947..6e88effa18 100644 --- a/experimental/Intersection/CubicIntersection.cpp +++ b/experimental/Intersection/CubicIntersection.cpp @@ -357,7 +357,7 @@ static bool doIntersect(const Cubic& cubic1, double t1s, double t1m, double t1e, Intersections xlocals; intersectWithOrder(s1a, o1a, s2a, o2a, xlocals); SkDebugf("xlocals.fUsed=%d\n", xlocals.used()); - } + } #endif intersectWithOrder(s1a, o1a, s2a, o2a, locals); for (int tIdx = 0; tIdx < locals.used(); ++tIdx) { @@ -370,7 +370,7 @@ static bool doIntersect(const Cubic& cubic1, double t1s, double t1m, double t1e, #if 0 && SK_DEBUG SkDebugf("to1=%1.9g p1=(%1.9g,%1.9g) to2=%1.9g p2=(%1.9g,%1.9g) d=%1.9g\n", to1, p1.x, p1.y, to2, p2.x, p2.y, p1.distance(p2)); - + #endif if (p1.approximatelyEqual(p2)) { i.insert(i.swapped() ? to2 : to1, i.swapped() ? to1 : to2); @@ -378,10 +378,10 @@ static bool doIntersect(const Cubic& cubic1, double t1s, double t1m, double t1e, } else { result = doIntersect(cubic1, p1s, to1, p1e, cubic2, p2s, to2, p2e, i); // if both cubics curve in the same direction, the quadratic intersection - // may mark a range that does not contain the cubic intersection. If no - // intersection is found, look again including the t distance of the + // may mark a range that does not contain the cubic intersection. If no + // intersection is found, look again including the t distance of the // of the quadratic intersection nearest a quadratic end (which in turn is - // nearest the actual cubic) + // nearest the actual cubic) if (!result) { double b1s = p1s; double b1e = p1e; @@ -446,7 +446,7 @@ static bool intersect2(const Cubic& cubic1, double t1s, double t1e, const Cubic& #endif Intersections locals; intersectWithOrder(s1, o1, s2, o2, locals); - + for (int tIdx = 0; tIdx < locals.used(); ++tIdx) { double to1 = t1Start + (t1 - t1Start) * locals.fT[0][tIdx]; double to2 = t2Start + (t2 - t2Start) * locals.fT[1][tIdx]; diff --git a/experimental/Intersection/TriangleUtilities.cpp b/experimental/Intersection/TriangleUtilities.cpp index 38a691646c..38915d4712 100644 --- a/experimental/Intersection/TriangleUtilities.cpp +++ b/experimental/Intersection/TriangleUtilities.cpp @@ -29,4 +29,3 @@ bool pointInTriangle(const Triangle& triangle, const _Point& pt) { // Check if point is in triangle return (u >= 0) && (v >= 0) && (u + v < 1); } - diff --git a/tools/PictureBenchmark.cpp b/tools/PictureBenchmark.cpp index a26cecd684..7490a89d5c 100644 --- a/tools/PictureBenchmark.cpp +++ b/tools/PictureBenchmark.cpp @@ -106,8 +106,8 @@ void PictureBenchmark::run(SkPicture* pict) { // then take the average. As such, it supports logPerIter and printMin options. // // Although "legal", having two gpu timers running at the same time - // seems to cause problems (i.e., INVALID_OPERATIONs) on several - // platforms. To work around this, we disable the gpu timer on the + // seems to cause problems (i.e., INVALID_OPERATIONs) on several + // platforms. To work around this, we disable the gpu timer on the // long running timer. SkAutoTDelete<BenchTimer> longRunningTimer(this->setupTimer(false)); TimerData longRunningTimerData(tiledRenderer->getPerIterTimeFormat(), |