From a448cb05f0aa0dbfff0282c03ec59da6d30cbb03 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Fri, 17 Aug 2012 20:32:29 +0000 Subject: 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 --- include/core/SkScalar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/core') 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 */) { -- cgit v1.2.3