Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: src/pathops/SkPathOpsPoint.h

Issue 13934009: path ops -- use standard max, min, double-is-nan (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/pathops/SkPathOpsBounds.h ('k') | src/pathops/SkPathOpsQuad.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « src/pathops/SkPathOpsBounds.h ('k') | src/pathops/SkPathOpsQuad.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698