diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-15 19:38:03 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-15 19:38:03 -0800 |
| commit | a76a6d8bcb76077fa248b64c5d64791dc8f23771 (patch) | |
| tree | 1ea7c74990f4ca926ca61f29fc63831e23303521 /third_party/libpng16/0000-build-config.patch | |
| parent | 2991d8d171e917912fd250c3c8ed693568dc1d8c (diff) | |
| download | pdfium-chromium/2625.tar.xz | |
XFA: Rename libpng to libpng16.chromium/2625chromium/2624
Otherwise this conflicts with Chromium's copy if the include paths just
happens to be in the wrong order. Since the two copies of libpng are of
different versions, we cannot use Chromium's copy.
TBR=tsepez@chromium.org,ochang@chromium.org
Review URL: https://codereview.chromium.org/1599513004 .
Diffstat (limited to 'third_party/libpng16/0000-build-config.patch')
| -rw-r--r-- | third_party/libpng16/0000-build-config.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/third_party/libpng16/0000-build-config.patch b/third_party/libpng16/0000-build-config.patch new file mode 100644 index 0000000000..7b7b158f32 --- /dev/null +++ b/third_party/libpng16/0000-build-config.patch @@ -0,0 +1,43 @@ +diff a/third_party/libpng16/pngmem.c b/third_party/libpng16/pngmem.c +--- a/third_party/libpng16/pngmem.c ++++ b/third_party/libpng16/pngmem.c +@@ -19,6 +19,9 @@ + + #include "pngpriv.h" + ++void* FXMEM_DefaultAlloc(int byte_size, int); ++void FXMEM_DefaultFree(void* pointer, int); ++ + #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) + /* Free a png_struct */ + void /* PRIVATE */ +@@ -92,7 +95,7 @@ + + else + #endif +- return malloc((size_t)size); /* checked for truncation above */ ++ return FXMEM_DefaultAlloc((int)size, 0); + } + + else +@@ -249,7 +252,7 @@ + return; + #endif /* USER_MEM */ + +- free(ptr); ++ FXMEM_DefaultFree(ptr, 0); + } + + #ifdef PNG_USER_MEM_SUPPORTED +diff a/third_party/libpng16/pngstruct.h b/third_party/libpng16/pngstruct.h +--- a/third_party/libpng16/pngstruct.h ++++ b/third_party/libpng16/pngstruct.h +@@ -27,7 +27,7 @@ + /* We must ensure that zlib uses 'const' in declarations. */ + # define ZLIB_CONST + #endif +-#include "zlib.h" ++#include "third_party/zlib_v128/zlib.h" + #ifdef const + /* zlib.h sometimes #defines const to nothing, undo this. */ + # undef const |