diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-23 11:56:44 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-23 11:56:44 +0000 |
| commit | 3b97af5add04489d57c7926ba6dc6f0013daf40f (patch) | |
| tree | 40db068c2b906575b3afa46cac6a2bbe9a840e39 /src/pathops/SkPathOpsPoint.h | |
| parent | c7e08bd6d06a421050ddd7060fbafa5b5e047752 (diff) | |
path ops -- use standard max, min, double-is-nan
fix a comment or two as well
Review URL: https://codereview.chromium.org/13934009
git-svn-id: http://skia.googlecode.com/svn/trunk@8822 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pathops/SkPathOpsPoint.h')
| -rw-r--r-- | src/pathops/SkPathOpsPoint.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pathops/SkPathOpsPoint.h b/src/pathops/SkPathOpsPoint.h index 713b457418..aca38d8900 100644 --- a/src/pathops/SkPathOpsPoint.h +++ b/src/pathops/SkPathOpsPoint.h @@ -96,8 +96,8 @@ struct SkDPoint { // 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 @@ struct SkDPoint { } 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 @@ struct SkDPoint { } 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; } |