diff options
author | 2018-06-15 15:37:57 +0000 | |
---|---|---|
committer | 2018-06-15 16:26:05 +0000 | |
commit | b0897650f1f4279d335994284bd15f972dee57bc (patch) | |
tree | 853f301a1e32b1fceb9714a582ddece676ac5a04 /include/core/SkImageInfo.h | |
parent | 46f25635474e6b1e4289cf9fd5f6c3ddd3696ead (diff) |
Reland "Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines."
This reverts commit ab17347df32807cabd9f2a518d22c3bd420e482f.
Reason for revert: Chromium should now be ok.
Original change's description:
> Revert "Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines."
>
> This reverts commit e1bc7de7c07686b28b00b850e44e0722189f3592.
>
> Reason for revert: chrome used it
>
> Original change's description:
> > Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines.
> >
> > sed 's/SK_MaxSizeT/SIZE_MAX/g'
> > sed 's/SK_MaxU32/UINT32_MAX/g'
> > sed 's/SK_MaxU16/UINT16_MAX/g'
> >
> > SK_MinU32 and SK_MinU16 were unused
> >
> > Change-Id: I6b6c824df47b05bde7e73b13a58e851a5f63fe0e
> > Reviewed-on: https://skia-review.googlesource.com/134607
> > Commit-Queue: Hal Canary <halcanary@google.com>
> > Reviewed-by: Ben Wagner <bungeman@google.com>
>
> TBR=halcanary@google.com,bungeman@google.com,reed@google.com
>
> Change-Id: I1e2c440dcf9f59bf87c1fea113248cd5136f7519
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/134921
> Reviewed-by: Hal Canary <halcanary@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>
CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux-ozone-rel
TBR=halcanary@google.com,bungeman@google.com,reed@google.com
Change-Id: I7709f9715bea0463b85b5b0a89712ac1020fcddb
Reviewed-on: https://skia-review.googlesource.com/135180
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'include/core/SkImageInfo.h')
-rw-r--r-- | include/core/SkImageInfo.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index 45275b698a..db3917f944 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -552,7 +552,7 @@ public: and rowBytes. rowBytes is assumed to be at least as large as minRowBytes(). Returns zero if height is zero. - Returns SK_MaxSizeT if answer exceeds the range of size_t. + Returns SIZE_MAX if answer exceeds the range of size_t. @param rowBytes size of pixel row or larger @return memory required by pixel buffer @@ -563,7 +563,7 @@ public: SkColorType. Uses minRowBytes() to compute bytes for pixel row. Returns zero if height is zero. - Returns SK_MaxSizeT if answer exceeds the range of size_t. + Returns SIZE_MAX if answer exceeds the range of size_t. @return least memory required by pixel buffer */ @@ -571,14 +571,14 @@ public: return this->computeByteSize(this->minRowBytes()); } - /** Returns true if byteSize equals SK_MaxSizeT. computeByteSize() and - computeMinByteSize() return SK_MaxSizeT if size_t can not hold buffer size. + /** Returns true if byteSize equals SIZE_MAX. computeByteSize() and + computeMinByteSize() return SIZE_MAX if size_t can not hold buffer size. @param byteSize result of computeByteSize() or computeMinByteSize() @return true if computeByteSize() or computeMinByteSize() result exceeds size_t */ static bool ByteSizeOverflowed(size_t byteSize) { - return SK_MaxSizeT == byteSize; + return SIZE_MAX == byteSize; } /** Returns true if rowBytes is smaller than width times pixel size. |