diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-09-30 11:12:05 -0700 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-09-30 11:12:05 -0700 |
| commit | d53e6fdb0a86ca1ddb12876a60f7f2d7508b5349 (patch) | |
| tree | 1d1eebf565936adff5d2d5c68741774e8d86f0eb /core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h | |
| parent | 1b24b697659b9b933f336238665c835497464a0b (diff) | |
| download | pdfium-d53e6fdb0a86ca1ddb12876a60f7f2d7508b5349.tar.xz | |
Update openjpeg
BUG=407964, 414182, 413447
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/589243004
Diffstat (limited to 'core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h')
| -rw-r--r-- | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h index f2fe82f1a3..5007b0c9e2 100644 --- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h +++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h @@ -50,7 +50,6 @@ Allocate an uninitialized memory block @param size Bytes to allocate @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available */ - #ifdef ALLOC_PERF_OPT void * OPJ_CALLCONV opj_malloc(size_t size); #else @@ -161,6 +160,7 @@ void * OPJ_CALLCONV opj_realloc(void * m, size_t s); #else #define opj_realloc(m, s) realloc(m, s) #endif +#endif /** Deallocates or frees a memory block. @@ -175,10 +175,11 @@ void OPJ_CALLCONV opj_free(void * m); #ifdef __GNUC__ #pragma GCC poison malloc calloc realloc free #endif -#endif + /* ----------------------------------------------------------------------- */ /*@}*/ /*@}*/ #endif /* __OPJ_MALLOC_H */ + |