| Index: src/pathops/SkPathOpsPoint.h
|
| ===================================================================
|
| --- src/pathops/SkPathOpsPoint.h (revision 8808)
|
| +++ src/pathops/SkPathOpsPoint.h (working copy)
|
| @@ -96,8 +96,8 @@
|
| // return approximately_equal(a.fY, fY) && approximately_equal(a.fX, fX);
|
| // because that will not take the magnitude of the values
|
| bool approximatelyEqual(const SkDPoint& a) const {
|
| - double denom = SkTMax<double>(fabs(fX), SkTMax<double>(fabs(fY),
|
| - SkTMax<double>(fabs(a.fX), fabs(a.fY))));
|
| + double denom = SkTMax(fabs(fX), SkTMax(fabs(fY),
|
| + SkTMax(fabs(a.fX), fabs(a.fY))));
|
| if (denom == 0) {
|
| return true;
|
| }
|
| @@ -107,8 +107,8 @@
|
| }
|
|
|
| bool approximatelyEqual(const SkPoint& a) const {
|
| - double denom = SkTMax<double>(fabs(fX), SkTMax<double>(fabs(fY),
|
| - SkScalarToDouble(SkTMax<SkScalar>(fabsf(a.fX), fabsf(a.fY)))));
|
| + double denom = SkTMax(fabs(fX), SkTMax(fabs(fY),
|
| + SkScalarToDouble(SkTMax(fabsf(a.fX), fabsf(a.fY)))));
|
| if (denom == 0) {
|
| return true;
|
| }
|
| @@ -118,8 +118,8 @@
|
| }
|
|
|
| bool approximatelyEqualHalf(const SkDPoint& a) const {
|
| - double denom = SkTMax<double>(fabs(fX), SkTMax<double>(fabs(fY),
|
| - SkTMax<double>(fabs(a.fX), fabs(a.fY))));
|
| + double denom = SkTMax(fabs(fX), SkTMax(fabs(fY),
|
| + SkTMax(fabs(a.fX), fabs(a.fY))));
|
| if (denom == 0) {
|
| return true;
|
| }
|
|
|