aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-17 20:32:29 +0000
committerGravatar borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-17 20:32:29 +0000
commita448cb05f0aa0dbfff0282c03ec59da6d30cbb03 (patch)
tree8dc362b2408c701fd995829dca0de19a26fa1a5c
parentca8af884bb78066dc8d4b8ea8d0337678f04c71e (diff)
Fix SkIntToScalar signature for 64-bit build
Review URL: https://codereview.appspot.com/6443147 git-svn-id: http://skia.googlecode.com/svn/trunk@5156 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--include/core/SkScalar.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h
index ed419689d8..a850cc61cd 100644
--- a/include/core/SkScalar.h
+++ b/include/core/SkScalar.h
@@ -85,10 +85,10 @@
static inline float SkIntToScalar(unsigned int param) {
return (float)param;
}
- static inline float SkIntToScalar(signed long param) {
+ static inline float SkIntToScalar(int64_t param) {
return (float)param;
}
- static inline float SkIntToScalar(unsigned long param) {
+ static inline float SkIntToScalar(uint64_t param) {
return (float)param;
}
static inline float SkIntToScalar(float /* param */) {