diff options
author | volzhs <volzhs@gmail.com> | 2020-01-17 03:49:31 +0900 |
---|---|---|
committer | volzhs <volzhs@gmail.com> | 2020-01-17 03:49:31 +0900 |
commit | 65f2ab1b61d0949bae7f06553b081e1aae276148 (patch) | |
tree | e9b85cdc26a2a140ac6675d90dced255eb72c3c6 /thirdparty/libwebp/src/utils | |
parent | 6b64c60b0eade65ca1147a0af39baefec732d652 (diff) |
Update libwebp to 1.1.0
Diffstat (limited to 'thirdparty/libwebp/src/utils')
-rw-r--r-- | thirdparty/libwebp/src/utils/color_cache_utils.h | 2 | ||||
-rw-r--r-- | thirdparty/libwebp/src/utils/thread_utils.c | 2 | ||||
-rw-r--r-- | thirdparty/libwebp/src/utils/utils.c | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/thirdparty/libwebp/src/utils/color_cache_utils.h b/thirdparty/libwebp/src/utils/color_cache_utils.h index ec21d5199b..b45d47c2d5 100644 --- a/thirdparty/libwebp/src/utils/color_cache_utils.h +++ b/thirdparty/libwebp/src/utils/color_cache_utils.h @@ -26,7 +26,7 @@ extern "C" { // Main color cache struct. typedef struct { - uint32_t *colors_; // color entries + uint32_t* colors_; // color entries int hash_shift_; // Hash shift: 32 - hash_bits_. int hash_bits_; } VP8LColorCache; diff --git a/thirdparty/libwebp/src/utils/thread_utils.c b/thirdparty/libwebp/src/utils/thread_utils.c index 438296b45f..4e470e17ac 100644 --- a/thirdparty/libwebp/src/utils/thread_utils.c +++ b/thirdparty/libwebp/src/utils/thread_utils.c @@ -73,7 +73,7 @@ typedef struct { #endif static int pthread_create(pthread_t* const thread, const void* attr, - unsigned int (__stdcall *start)(void*), void* arg) { + unsigned int (__stdcall* start)(void*), void* arg) { (void)attr; #ifdef USE_CREATE_THREAD *thread = CreateThread(NULL, /* lpThreadAttributes */ diff --git a/thirdparty/libwebp/src/utils/utils.c b/thirdparty/libwebp/src/utils/utils.c index 44d5c14f01..764f752b82 100644 --- a/thirdparty/libwebp/src/utils/utils.c +++ b/thirdparty/libwebp/src/utils/utils.c @@ -216,9 +216,14 @@ void WebPSafeFree(void* const ptr) { free(ptr); } -// Public API function. +// Public API functions. + +void* WebPMalloc(size_t size) { + return WebPSafeMalloc(1, size); +} + void WebPFree(void* ptr) { - free(ptr); + WebPSafeFree(ptr); } //------------------------------------------------------------------------------ |