diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 14:53:55 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-13 14:53:55 +0000 |
| commit | bf0001d0472d727266762c5967ec0d919a6df083 (patch) | |
| tree | c46e6f735ec8e5090fd50dc4963a3ca9a1ff6362 /src/core/SkMath.cpp | |
| parent | a7d89c83a461aa3f549776060141a4f710de2da7 (diff) | |
remove remaining references to Sk64 (obsolete)
BUG=
Review URL: https://codereview.chromium.org/136673002
git-svn-id: http://skia.googlecode.com/svn/trunk@13042 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkMath.cpp')
| -rw-r--r-- | src/core/SkMath.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp index e7c4fdcc53..25ac9aa936 100644 --- a/src/core/SkMath.cpp +++ b/src/core/SkMath.cpp @@ -8,7 +8,6 @@ #include "SkMathPriv.h" #include "SkFloatBits.h" #include "SkFloatingPoint.h" -#include "Sk64.h" #include "SkScalar.h" const uint32_t gIEEENotANumber = 0x7FFFFFFF; @@ -47,10 +46,8 @@ int SkCLZ_portable(uint32_t x) { int32_t SkMulDiv(int32_t numer1, int32_t numer2, int32_t denom) { SkASSERT(denom); - Sk64 tmp; - tmp.setMul(numer1, numer2); - tmp.div(denom, Sk64::kTrunc_DivOption); - return tmp.get32(); + int64_t tmp = sk_64_mul(numer1, numer2) / denom; + return sk_64_asS32(tmp); } SkFixed SkFixedMul_portable(SkFixed a, SkFixed b) { |