diff options
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkImageInfo.h | 12 | ||||
| -rw-r--r-- | include/core/SkTypes.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index 212d96ef5e..fa3797bbb5 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -317,11 +317,19 @@ public: } #endif +#ifdef SK_SUPPORT_LEGACY_COMPUTEBYTESIZE_RET_0 /** * Returns the size (in bytes) of the image buffer that this info needs, given the specified * rowBytes. The rowBytes must be >= this->minRowBytes(). * If the calculation overflows, or if the height is 0, this returns 0. */ +#else + /** + * Returns the size (in bytes) of the image buffer that this info needs, given the specified + * rowBytes. The rowBytes must be >= this->minRowBytes(). + * If the calculation overflows this returns SK_MaxSizeT + */ +#endif size_t computeByteSize(size_t rowBytes) const; /** @@ -334,7 +342,11 @@ public: // Returns true if the result of computeByteSize (or computeMinByteSize) overflowed static bool ByteSizeOverflowed(size_t byteSize) { +#ifdef SK_SUPPORT_LEGACY_COMPUTEBYTESIZE_RET_0 return 0 == byteSize; +#else + return SK_MaxSizeT == byteSize; +#endif } bool validRowBytes(size_t rowBytes) const { diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index 63a2b40591..59bdaaa90c 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -233,6 +233,7 @@ template <typename D, typename S> D SkTo(S s) { #define SK_MaxU32 0xFFFFFFFF #define SK_MinU32 0 #define SK_NaN32 ((int) (1U << 31)) +#define SK_MaxSizeT SIZE_MAX static inline int32_t SkLeftShift(int32_t value, int32_t shift) { return (int32_t) ((uint32_t) value << shift); |