| Index: core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h
|
| diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h
|
| index ed1dfaf9836f7a56d82cb646332eadd74e43feb0..f2fe82f1a319e9b1aa7b54d779be06d866c64f73 100644
|
| --- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h
|
| +++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h
|
| @@ -50,16 +50,7 @@ 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
|
| */
|
| -#define _FOXIT_MEM_MANAGER_
|
| -#ifdef _FOXIT_MEM_MANAGER_
|
| -void* opj_malloc(size_t size);
|
| -void* opj_calloc(size_t _NumOfElements, size_t _SizeOfElements);
|
| -void* opj_realloc(void * m, size_t s);
|
| -void opj_free(void * m);
|
| -
|
| -#define opj_aligned_malloc(size) opj_malloc(size)
|
| -#define opj_aligned_free(m) opj_free(m)
|
| -#else
|
| +
|
| #ifdef ALLOC_PERF_OPT
|
| void * OPJ_CALLCONV opj_malloc(size_t size);
|
| #else
|
| @@ -170,7 +161,6 @@ 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.
|
|
|