diff options
Diffstat (limited to 'gfx/skia/trunk/include/core/SkTypes.h')
| -rw-r--r-- | gfx/skia/trunk/include/core/SkTypes.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gfx/skia/trunk/include/core/SkTypes.h b/gfx/skia/trunk/include/core/SkTypes.h index 4d590c24d..e94ca753c 100644 --- a/gfx/skia/trunk/include/core/SkTypes.h +++ b/gfx/skia/trunk/include/core/SkTypes.h @@ -65,6 +65,11 @@ SK_API extern void* sk_calloc(size_t size); */ SK_API extern void* sk_calloc_throw(size_t size); +// Performs a safe multiply count * elemSize, checking for overflow +SK_API extern void* sk_calloc_throw(size_t count, size_t elemSize); +SK_API extern void* sk_malloc_throw(size_t count, size_t elemSize); +SK_API extern void* sk_realloc_throw(void* buffer, size_t count, size_t elemSize); + // bzero is safer than memset, but we can't rely on it, so... sk_bzero() static inline void sk_bzero(void* buffer, size_t size) { memset(buffer, 0, size); @@ -268,7 +273,8 @@ typedef uint8_t SkBool8; #define SK_MinS32 -SK_MaxS32 #define SK_MaxU32 0xFFFFFFFF #define SK_MinU32 0 -#define SK_NaN32 (1 << 31) +#define SK_NaN32 ((int) (1 << 31)) +#define SK_MaxSizeT SIZE_MAX /** Returns true if the value can be represented with signed 16bits */ |