aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-17 20:53:48 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-17 20:53:48 +0000
commitcf4335ca4a35a9d1ff9fba0482f32a9a85474b97 (patch)
tree72cdbf933999f633cc8c48da3f3d6a52c8d46038 /include/core
parenta448cb05f0aa0dbfff0282c03ec59da6d30cbb03 (diff)
add long/unsigned-long variations to the debug SkIntToScalar, as the mac compiler
makes a distinction between int and long (it appears) git-svn-id: http://skia.googlecode.com/svn/trunk@5157 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkScalar.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h
index a850cc61cd..f070868562 100644
--- a/include/core/SkScalar.h
+++ b/include/core/SkScalar.h
@@ -79,12 +79,18 @@
* int, size_t, U8CPU, etc., even though what we really mean is "anything
* but a float".
*/
- static inline float SkIntToScalar(signed int param) {
+ static inline float SkIntToScalar(int param) {
return (float)param;
}
static inline float SkIntToScalar(unsigned int param) {
return (float)param;
}
+ static inline float SkIntToScalar(long param) {
+ return (float)param;
+ }
+ static inline float SkIntToScalar(unsigned long param) {
+ return (float)param;
+ }
static inline float SkIntToScalar(int64_t param) {
return (float)param;
}