From a030818936aa8f56db3cbf2d7fa14c1e5a543055 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 17 Aug 2012 21:13:17 +0000 Subject: revert 5156 git-svn-id: http://skia.googlecode.com/svn/trunk@5160 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkScalar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index a850cc61cd..ed419689d8 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(int64_t param) { + static inline float SkIntToScalar(signed long param) { return (float)param; } - static inline float SkIntToScalar(uint64_t param) { + static inline float SkIntToScalar(unsigned long param) { return (float)param; } static inline float SkIntToScalar(float /* param */) { -- cgit v1.2.3