From cf4335ca4a35a9d1ff9fba0482f32a9a85474b97 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 17 Aug 2012 20:53:48 +0000 Subject: 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 --- include/core/SkScalar.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3