diff options
| author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-19 22:28:48 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-19 22:28:48 +0000 |
| commit | 3acd3ab8810fc52348db20c5ec7311c1426f3f7c (patch) | |
| tree | d8f887acb352d9c26887c4e46a5680156faf9ab2 /core/SkFixed.h | |
| parent | 334122f13736cf301d3b2345d27b38c842954075 (diff) | |
| download | include-3acd3ab8810fc52348db20c5ec7311c1426f3f7c.tar.gz | |
Revert "begin to remove SkLONGLONG and wean Skia off of Sk64"
This reverts commit 784890196fdab96289f9389db43aca01f35db0f9.
Revert "use LL suffix for 64bit literal"
This reverts commit 9634295aff9bffd7a3875a0ca4a9b1a27d0793fc.
BUG=
Review URL: https://codereview.chromium.org/116543009
git-svn-id: http://skia.googlecode.com/svn/trunk/include@12790 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'core/SkFixed.h')
| -rw-r--r-- | core/SkFixed.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/SkFixed.h b/core/SkFixed.h index 42a9eec..580d94b 100644 --- a/core/SkFixed.h +++ b/core/SkFixed.h @@ -118,11 +118,11 @@ static inline SkFixed SkFixedCos(SkFixed radians) { #ifdef SkLONGLONG inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b) { - return (SkFixed)((int64_t)a * b >> 16); + return (SkFixed)((SkLONGLONG)a * b >> 16); } inline SkFixed SkFixedSquare_longlong(SkFixed value) { - return (SkFixed)((int64_t)value * value >> 16); + return (SkFixed)((SkLONGLONG)value * value >> 16); } #define SkFixedMul(a,b) SkFixedMul_longlong(a,b) #define SkFixedSquare(a) SkFixedSquare_longlong(a) |