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/SkDLineIntersection.cpp | |
| 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/SkDLineIntersection.cpp')
| -rw-r--r-- | src/pathops/SkDLineIntersection.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/pathops/SkDLineIntersection.cpp b/src/pathops/SkDLineIntersection.cpp index 93f0353048..68e1f9e421 100644 --- a/src/pathops/SkDLineIntersection.cpp +++ b/src/pathops/SkDLineIntersection.cpp @@ -109,16 +109,16 @@ int SkIntersections::intersect(const SkDLine& a, const SkDLine& b) { if ((at0 < 0 && at1 < 0) || (at0 > 1 && at1 > 1)) { return fUsed = 0; } - fT[0][0] = SkTMax<double>(SkTMin<double>(at0, 1.0), 0.0); - fT[0][1] = SkTMax<double>(SkTMin<double>(at1, 1.0), 0.0); + fT[0][0] = SkTMax(SkTMin(at0, 1.0), 0.0); + fT[0][1] = SkTMax(SkTMin(at1, 1.0), 0.0); } double bDenom = b0 - b1; if (approximately_zero(bDenom)) { fT[1][0] = fT[1][1] = 0; } else { int bIn = aDenom * bDenom < 0; - fT[1][bIn] = SkTMax<double>(SkTMin<double>((b0 - a0) / bDenom, 1.0), 0.0); - fT[1][!bIn] = SkTMax<double>(SkTMin<double>((b0 - a1) / bDenom, 1.0), 0.0); + fT[1][bIn] = SkTMax(SkTMin((b0 - a0) / bDenom, 1.0), 0.0); + fT[1][!bIn] = SkTMax(SkTMin((b0 - a1) / bDenom, 1.0), 0.0); } bool second = fabs(fT[0][0] - fT[0][1]) > FLT_EPSILON; SkASSERT((fabs(fT[1][0] - fT[1][1]) <= FLT_EPSILON) ^ second); @@ -189,11 +189,11 @@ int SkIntersections::horizontal(const SkDLine& line, double left, double right, if ((at0 < 0 && at1 < 0) || (at0 > 1 && at1 > 1)) { return fUsed = 0; } - fT[0][0] = SkTMax<double>(SkTMin<double>(at0, 1.0), 0.0); - fT[0][1] = SkTMax<double>(SkTMin<double>(at1, 1.0), 0.0); + fT[0][0] = SkTMax(SkTMin(at0, 1.0), 0.0); + fT[0][1] = SkTMax(SkTMin(at1, 1.0), 0.0); int bIn = (a0 - a1) * (b0 - b1) < 0; - fT[1][bIn] = SkTMax<double>(SkTMin<double>((b0 - a0) / (b0 - b1), 1.0), 0.0); - fT[1][!bIn] = SkTMax<double>(SkTMin<double>((b0 - a1) / (b0 - b1), 1.0), 0.0); + fT[1][bIn] = SkTMax(SkTMin((b0 - a0) / (b0 - b1), 1.0), 0.0); + fT[1][!bIn] = SkTMax(SkTMin((b0 - a1) / (b0 - b1), 1.0), 0.0); bool second = fabs(fT[0][0] - fT[0][1]) > FLT_EPSILON; SkASSERT((fabs(fT[1][0] - fT[1][1]) <= FLT_EPSILON) ^ second); return computePoints(line, 1 + second); @@ -250,11 +250,11 @@ int SkIntersections::vertical(const SkDLine& line, double top, double bottom, if ((at0 < 0 && at1 < 0) || (at0 > 1 && at1 > 1)) { return fUsed = 0; } - fT[0][0] = SkTMax<double>(SkTMin<double>(at0, 1.0), 0.0); - fT[0][1] = SkTMax<double>(SkTMin<double>(at1, 1.0), 0.0); + fT[0][0] = SkTMax(SkTMin(at0, 1.0), 0.0); + fT[0][1] = SkTMax(SkTMin(at1, 1.0), 0.0); int bIn = (a0 - a1) * (b0 - b1) < 0; - fT[1][bIn] = SkTMax<double>(SkTMin<double>((b0 - a0) / (b0 - b1), 1.0), 0.0); - fT[1][!bIn] = SkTMax<double>(SkTMin<double>((b0 - a1) / (b0 - b1), 1.0), 0.0); + fT[1][bIn] = SkTMax(SkTMin((b0 - a0) / (b0 - b1), 1.0), 0.0); + fT[1][!bIn] = SkTMax(SkTMin((b0 - a1) / (b0 - b1), 1.0), 0.0); bool second = fabs(fT[0][0] - fT[0][1]) > FLT_EPSILON; SkASSERT((fabs(fT[1][0] - fT[1][1]) <= FLT_EPSILON) ^ second); return computePoints(line, 1 + second); |