diff options
| author |  Hal Canary <halcanary@google.com> | 2018-06-14 16:17:29 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-14 16:17:38 +0000 |
| commit | ab17347df32807cabd9f2a518d22c3bd420e482f (patch) | |
| tree | 02cca902ae0fefc6a629340a7a95192e427353c9 /include/core/SkTypes.h | |
| parent | b94097f315fb28c01f7b49d0e9f5b8ddf6a8fe5e (diff) | |
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>
Diffstat (limited to 'include/core/SkTypes.h')
| -rw-r--r-- | include/core/SkTypes.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index e624d4518c..f906816587 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -100,12 +100,17 @@ typedef unsigned U16CPU; */ #define SkToBool(cond) ((cond) != 0) -#define SK_MaxS16 INT16_MAX -#define SK_MinS16 -SK_MaxS16 -#define SK_MaxS32 INT32_MAX +#define SK_MaxS16 32767 +#define SK_MinS16 -32767 +#define SK_MaxU16 0xFFFF +#define SK_MinU16 0 +#define SK_MaxS32 0x7FFFFFFF #define SK_MinS32 -SK_MaxS32 -#define SK_NaN32 INT32_MIN -static constexpr int64_t SK_MaxS64 = INT64_MAX; +#define SK_MaxU32 0xFFFFFFFF +#define SK_MinU32 0 +#define SK_NaN32 ((int) (1U << 31)) +#define SK_MaxSizeT SIZE_MAX +static constexpr int64_t SK_MaxS64 = 0x7FFFFFFFFFFFFFFF; static constexpr int64_t SK_MinS64 = -SK_MaxS64; static inline constexpr int32_t SkLeftShift(int32_t value, int32_t shift) { |