diff options
| author |  Mike Reed <reed@google.com> | 2017-10-03 14:47:21 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-03 20:03:35 +0000 |
| commit | f0ffb8943b7be477b769db23660a80013f3332eb (patch) | |
| tree | 9aa9b49cf411799b50168bd16aee922bc9b13f8e /include/core/SkImageInfo.h | |
| parent | d140fe910e11edf2496439e39ba6ca15d5bc17db (diff) | |
Revert[4] "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap"
This reverts commit 5a2e50edc51006ce91366e177a9d21a16775d7fd.
Bug: skia:
Change-Id: I8d28b5c07d90130e5a1653923740eaf189ecb954
Reviewed-on: https://skia-review.googlesource.com/53900
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/core/SkImageInfo.h')
| -rw-r--r-- | include/core/SkImageInfo.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index c47dbb28b1..50d068a09c 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -300,6 +300,7 @@ public: void unflatten(SkReadBuffer&); void flatten(SkWriteBuffer&) const; +#ifdef SK_SUPPORT_LEGACY_SAFESIZE64 int64_t getSafeSize64(size_t rowBytes) const { if (0 == fHeight) { return 0; @@ -314,6 +315,7 @@ public: } return sk_64_asS32(size); } +#endif /** * Returns the size (in bytes) of the image buffer that this info needs, given the specified @@ -331,8 +333,8 @@ public: } bool validRowBytes(size_t rowBytes) const { - uint64_t rb = sk_64_mul(fWidth, this->bytesPerPixel()); - return rowBytes >= rb; + uint64_t minRB = sk_64_mul(fWidth, this->bytesPerPixel()); + return rowBytes >= minRB; } void reset() { |