diff options
| author |  Mike Reed <reed@google.com> | 2017-10-06 21:23:58 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-06 21:24:10 +0000 |
| commit | 384f0a7d6626026f21313e85e51890d747171ee8 (patch) | |
| tree | 7216797795c0c83d8de970250ffb14e9a9ca8cd4 /src/core/SkImageInfo.cpp | |
| parent | e1da1d9a7dfa6c9ebdcbd2845acebd045edd2a6f (diff) | |
Revert "change computeByteSize to return max_size_t on overflow"
This reverts commit 24295462722fd5a298d108a80b0aacbb0964da53.
Reason for revert: broke running dm on google3
Original change's description:
> change computeByteSize to return max_size_t on overflow
>
> Bug: skia:7132
> Change-Id: I41045640ee62b2c988a84370ead5034bbccc6daf
> Reviewed-on: https://skia-review.googlesource.com/56620
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=bungeman@google.com,herb@google.com,reed@google.com
Change-Id: I5f58ec37241d2fae3ebdb7a3d6b41f9fd6d3c2ee
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7132
Reviewed-on: https://skia-review.googlesource.com/56880
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkImageInfo.cpp')
| -rw-r--r-- | src/core/SkImageInfo.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/SkImageInfo.cpp b/src/core/SkImageInfo.cpp index 9e08768d7b..c610b82bdc 100644 --- a/src/core/SkImageInfo.cpp +++ b/src/core/SkImageInfo.cpp @@ -78,11 +78,7 @@ size_t SkImageInfo::computeByteSize(size_t rowBytes) const { SkSafeMath safe; size_t bytes = safe.add(safe.mul(fHeight - 1, rowBytes), safe.mul(fWidth, this->bytesPerPixel())); -#ifdef SK_SUPPORT_LEGACY_COMPUTEBYTESIZE_RET_0 return safe ? bytes : 0; -#else - return safe ? bytes : SK_MaxSizeT; -#endif } static bool alpha_type_is_valid(SkAlphaType alphaType) { |