diff options
author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-07-08 15:30:46 -0700 |
---|---|---|
committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-07-08 15:30:46 -0700 |
commit | 3522876d5291922ddc62bf1b70d02743b0850673 (patch) | |
tree | b3fd7eda6e8ed8f07674f6a6fba21e82ca83bee7 /core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c | |
parent | e7ee98e4c6fd56c9e930194e9fc11cc10e8293a1 (diff) | |
download | pdfium-3522876d5291922ddc62bf1b70d02743b0850673.tar.xz |
Remove custom memory manager
BUG=
R=palmer@chromium.org
Review URL: https://codereview.chromium.org/372473003
Diffstat (limited to 'core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c')
-rw-r--r-- | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c index 77a864ebb9..bf411efca5 100644 --- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c +++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c @@ -10253,43 +10253,3 @@ OPJ_BOOL opj_j2k_write_tile (opj_j2k_t * p_j2k, return OPJ_TRUE; } - -#ifdef _FOXIT_MEM_MANAGER_ -/** Allocate number of bytes */ -void* FXMEM_DefaultAlloc(int byte_size, int flags); -void* FXMEM_DefaultRealloc(void* pointer, int new_size, int flags); -void FXMEM_DefaultFree(void* pointer, int flags); - -void* opj_malloc(size_t size) -{ - if (size >= (size_t)-0x100 || (int)size < 0) return NULL; - - return FXMEM_DefaultAlloc(size, 0); -} - -void* opj_calloc(size_t _NumOfElements, size_t _SizeOfElements) -{ - void* buffer = NULL; - - if (_NumOfElements != 0 && _NumOfElements >= (size_t)-0x100 / _SizeOfElements) return NULL; - if ((int)_NumOfElements < 0 || (int)_SizeOfElements < 0) return NULL; - - buffer = FXMEM_DefaultAlloc(_NumOfElements * _SizeOfElements, 0); - if (!buffer) return 0; - - memset(buffer, 0, _NumOfElements * _SizeOfElements); - return buffer; -} - -void* opj_realloc(void * m, size_t s) -{ - if (s >= (size_t)-0x100 || (int)s < 0) return NULL; - return FXMEM_DefaultRealloc(m, s, 0); -} - -void opj_free(void * m) -{ - FXMEM_DefaultFree(m, 0); -} - -#endif |