diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-17 21:13:17 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-17 21:13:17 +0000 |
| commit | a030818936aa8f56db3cbf2d7fa14c1e5a543055 (patch) | |
| tree | ca6d42924b7a3123638e373fc83154d7de7a8f3b /include | |
| parent | dd8dd8f77b5802bdcb7b980761b54a055586b351 (diff) | |
revert 5156
git-svn-id: http://skia.googlecode.com/svn/trunk@5160 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkScalar.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 */) { |