aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/codec
diff options
context:
space:
mode:
authorGravatar Herb Derby <herb@google.com>2017-09-20 11:56:00 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-21 20:29:24 +0000
commitc402b778d5707ac2f66c9f38d5bbc20fb79321b5 (patch)
treea44c07179a8bef6fda66177acc14d18ec5e4cd0b /src/codec
parent0e42586036c3fbd3c3092680df853a0c2e2e82fa (diff)
Remove sk_64_isS32 and sk_64_asS32
This is an API change. I assume that only Skia uses these routines. Change-Id: Iefc98fa5c0b83eb4f52c478e345fd99121ecb254 Reviewed-on: https://skia-review.googlesource.com/129440 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/codec')
-rw-r--r--src/codec/SkWebpCodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codec/SkWebpCodec.cpp b/src/codec/SkWebpCodec.cpp
index 95ae9b9593..757cde5699 100644
--- a/src/codec/SkWebpCodec.cpp
+++ b/src/codec/SkWebpCodec.cpp
@@ -81,7 +81,7 @@ std::unique_ptr<SkCodec> SkWebpCodec::MakeFromStream(std::unique_ptr<SkStream> s
{
const int64_t size = sk_64_mul(width, height);
// now check that if we are 4-bytes per pixel, we also don't overflow
- if (!sk_64_isS32(size) || sk_64_asS32(size) > (0x7FFFFFFF >> 2)) {
+ if (!SkTFitsIn<int32_t>(size) || SkTo<int32_t>(size) > (0x7FFFFFFF >> 2)) {
*result = kInvalidInput;
return nullptr;
}