aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkMask.cpp
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-13 14:53:55 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-13 14:53:55 +0000
commitbf0001d0472d727266762c5967ec0d919a6df083 (patch)
treec46e6f735ec8e5090fd50dc4963a3ca9a1ff6362 /src/core/SkMask.cpp
parenta7d89c83a461aa3f549776060141a4f710de2da7 (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/SkMask.cpp')
-rw-r--r--src/core/SkMask.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/SkMask.cpp b/src/core/SkMask.cpp
index 09744194b9..f3ae88a906 100644
--- a/src/core/SkMask.cpp
+++ b/src/core/SkMask.cpp
@@ -5,18 +5,15 @@
* found in the LICENSE file.
*/
-
-#include "Sk64.h"
#include "SkMask.h"
/** returns the product if it is positive and fits in 31 bits. Otherwise this
returns 0.
*/
static int32_t safeMul32(int32_t a, int32_t b) {
- Sk64 size;
- size.setMul(a, b);
- if (size.is32() && size.isPos()) {
- return size.get32();
+ int64_t size = sk_64_mul(a, b);
+ if (size > 0 && sk_64_isS32(size)) {
+ return sk_64_asS32(size);
}
return 0;
}