diff options
| author |  Herb Derby <herb@google.com> | 2017-09-20 11:56:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-21 20:29:24 +0000 |
| commit | c402b778d5707ac2f66c9f38d5bbc20fb79321b5 (patch) | |
| tree | a44c07179a8bef6fda66177acc14d18ec5e4cd0b /include/core/SkImageInfo.h | |
| parent | 0e42586036c3fbd3c3092680df853a0c2e2e82fa (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 'include/core/SkImageInfo.h')
| -rw-r--r-- | include/core/SkImageInfo.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index 48edcd2181..eb96f19723 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -12,6 +12,7 @@ #include "SkMath.h" #include "SkRect.h" #include "SkSize.h" +#include "../private/SkTFitsIn.h" class SkReadBuffer; class SkWriteBuffer; @@ -551,10 +552,10 @@ public: */ size_t minRowBytes() const { uint64_t minRowBytes = this->minRowBytes64(); - if (!sk_64_isS32(minRowBytes)) { + if (!SkTFitsIn<int32_t>(minRowBytes)) { return 0; } - return sk_64_asS32(minRowBytes); + return SkTo<int32_t>(minRowBytes); } /** Returns byte offset of pixel from pixel base address. |