diff options
Diffstat (limited to 'experimental')
-rw-r--r-- | experimental/Intersection/CubicIntersection.cpp | 2 | ||||
-rw-r--r-- | experimental/Intersection/CubicUtilities.cpp | 2 | ||||
-rw-r--r-- | experimental/Intersection/DataTypes.h | 2 | ||||
-rw-r--r-- | experimental/Intersection/QuadraticUtilities.cpp | 2 | ||||
-rw-r--r-- | experimental/Intersection/QuarticRoot.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/experimental/Intersection/CubicIntersection.cpp b/experimental/Intersection/CubicIntersection.cpp index a5b4261dfe..8de6398622 100644 --- a/experimental/Intersection/CubicIntersection.cpp +++ b/experimental/Intersection/CubicIntersection.cpp @@ -284,7 +284,7 @@ static bool intersect2(const Cubic& cubic1, double t1s, double t1e, const Cubic& cubic1, SkTMax(to1 - dt1, 0.), SkTMin(to1 + dt1, 1.), i); i.swap(); --debugDepth; - + } } t2Start = t2; diff --git a/experimental/Intersection/CubicUtilities.cpp b/experimental/Intersection/CubicUtilities.cpp index 3e2f474d7c..70f10c17a4 100644 --- a/experimental/Intersection/CubicUtilities.cpp +++ b/experimental/Intersection/CubicUtilities.cpp @@ -162,7 +162,7 @@ int cubicRootsReal(double A, double B, double C, double D, double s[3]) { *roots++ = -u - adiv3; } } - else + else #endif if (R2MinusQ3 < 0) // we have 3 real roots { diff --git a/experimental/Intersection/DataTypes.h b/experimental/Intersection/DataTypes.h index de763edcc2..a6516fa0fc 100644 --- a/experimental/Intersection/DataTypes.h +++ b/experimental/Intersection/DataTypes.h @@ -63,7 +63,7 @@ inline bool approximately_equal(double x, double y) { return approximately_zero(x - y); #else // see http://visualstudiomagazine.com/blogs/tool-tracker/2011/11/compare-floating-point-numbers.aspx -// this allows very small (e.g. degenerate) values to compare unequally, but in this case, +// this allows very small (e.g. degenerate) values to compare unequally, but in this case, // AlmostEqualUlps should be used instead. if (x == y) { return true; diff --git a/experimental/Intersection/QuadraticUtilities.cpp b/experimental/Intersection/QuadraticUtilities.cpp index 475ec13b7d..c1fab05822 100644 --- a/experimental/Intersection/QuadraticUtilities.cpp +++ b/experimental/Intersection/QuadraticUtilities.cpp @@ -21,7 +21,7 @@ and using the roots */ - + int add_valid_ts(double s[], int realRoots, double* t) { int foundRoots = 0; for (int index = 0; index < realRoots; ++index) { diff --git a/experimental/Intersection/QuarticRoot.h b/experimental/Intersection/QuarticRoot.h index f76509e2f4..3692caa1b6 100644 --- a/experimental/Intersection/QuarticRoot.h +++ b/experimental/Intersection/QuarticRoot.h @@ -1,5 +1,5 @@ int reducedQuarticRoots(const double t4, const double t3, const double t2, const double t1, const double t0, const bool oneHint, double s[4]); - + int quarticRootsReal(const double A, const double B, const double C, const double D, const double E, double s[4]); |