diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-11-03 22:18:18 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-03 22:18:18 +0000 |
| commit | b810da2788d0aca491bee55b0f9d97b48e682bbf (patch) | |
| tree | 5bc3c77f1fc0945b6db71c62f9f347ff3dc1e398 /third_party/libpng16 | |
| parent | 882a190807b6f791e3b3f1a692c59fb93d746f94 (diff) | |
| download | pdfium-b810da2788d0aca491bee55b0f9d97b48e682bbf.tar.xz | |
Remove flags param from FXMEM_DefaultAlloc() and friends.
Change-Id: I24404be0065156a1cfdec31bafdf72c27fa70142
Reviewed-on: https://pdfium-review.googlesource.com/17792
Reviewed-by: Chris Palmer <palmer@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'third_party/libpng16')
| -rw-r--r-- | third_party/libpng16/0000-build-config.patch | 8 | ||||
| -rw-r--r-- | third_party/libpng16/pngmem.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/third_party/libpng16/0000-build-config.patch b/third_party/libpng16/0000-build-config.patch index 5c30866405..325b58fe02 100644 --- a/third_party/libpng16/0000-build-config.patch +++ b/third_party/libpng16/0000-build-config.patch @@ -5,8 +5,8 @@ diff a/third_party/libpng16/pngmem.c b/third_party/libpng16/pngmem.c #include "pngpriv.h" -+void* FXMEM_DefaultAlloc(int byte_size, int); -+void FXMEM_DefaultFree(void* pointer, int); ++void* FXMEM_DefaultAlloc(size_t byte_size); ++void FXMEM_DefaultFree(void* pointer); + #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) /* Free a png_struct */ @@ -16,7 +16,7 @@ diff a/third_party/libpng16/pngmem.c b/third_party/libpng16/pngmem.c else #endif - return malloc((size_t)size); /* checked for truncation above */ -+ return FXMEM_DefaultAlloc((int)size, 0); ++ return FXMEM_DefaultAlloc(size); } else @@ -25,7 +25,7 @@ diff a/third_party/libpng16/pngmem.c b/third_party/libpng16/pngmem.c #endif /* USER_MEM */ - free(ptr); -+ FXMEM_DefaultFree(ptr, 0); ++ FXMEM_DefaultFree(ptr); } #ifdef PNG_USER_MEM_SUPPORTED diff --git a/third_party/libpng16/pngmem.c b/third_party/libpng16/pngmem.c index b5507134fb..cf815a6f88 100644 --- a/third_party/libpng16/pngmem.c +++ b/third_party/libpng16/pngmem.c @@ -19,8 +19,8 @@ #include "pngpriv.h" -void* FXMEM_DefaultAlloc(int byte_size, int); -void FXMEM_DefaultFree(void* pointer, int); +void* FXMEM_DefaultAlloc(size_t byte_size); +void FXMEM_DefaultFree(void* pointer); #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) /* Free a png_struct */ @@ -95,7 +95,7 @@ png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size), else #endif - return FXMEM_DefaultAlloc((int)size, 0); + return FXMEM_DefaultAlloc(size); } else @@ -252,7 +252,7 @@ png_free_default,(png_const_structrp png_ptr, png_voidp ptr),PNG_DEPRECATED) return; #endif /* USER_MEM */ - FXMEM_DefaultFree(ptr, 0); + FXMEM_DefaultFree(ptr); } #ifdef PNG_USER_MEM_SUPPORTED |