rename round, ceil, etc. to avoid some platform macros
git-svn-id: http://skia.googlecode.com/svn/trunk@577 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkSize.h b/include/core/SkSize.h
index 9df9508..8371c9b 100644
--- a/include/core/SkSize.h
+++ b/include/core/SkSize.h
@@ -83,19 +83,19 @@
return *this;
}
- SkISize round() const {
+ SkISize toRound() const {
SkISize s;
s.set(SkScalarRound(fWidth), SkScalarRound(fHeight));
return s;
}
-
- SkISize ceil() const {
+
+ SkISize toCeil() const {
SkISize s;
s.set(SkScalarCeil(fWidth), SkScalarCeil(fHeight));
return s;
}
- SkISize floor() const {
+ SkISize toFloor() const {
SkISize s;
s.set(SkScalarFloor(fWidth), SkScalarFloor(fHeight));
return s;
diff --git a/tests/TestSize.cpp b/tests/TestSize.cpp
index 6551509..9e0aaaa 100644
--- a/tests/TestSize.cpp
+++ b/tests/TestSize.cpp
@@ -53,7 +53,7 @@
SkISize ia;
ia.set(ix, iy);
a.set(x, y);
- REPORTER_ASSERT(reporter, a.round() == ia);
+ REPORTER_ASSERT(reporter, a.toRound() == ia);
};
#include "TestClassDef.h"