From 3522876d5291922ddc62bf1b70d02743b0850673 Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Tue, 8 Jul 2014 15:30:46 -0700 Subject: Remove custom memory manager BUG= R=palmer@chromium.org Review URL: https://codereview.chromium.org/372473003 --- core/src/fxcodec/lcms2/lcms2-2.6/src/cmserr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/src/fxcodec/lcms2') diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmserr.c b/core/src/fxcodec/lcms2/lcms2-2.6/src/cmserr.c index 87c6320cff..964182ae38 100644 --- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmserr.c +++ b/core/src/fxcodec/lcms2/lcms2-2.6/src/cmserr.c @@ -262,13 +262,13 @@ cmsBool _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plugi // Generic allocate void* CMSEXPORT _cmsMalloc(cmsContext ContextID, cmsUInt32Number size) { - return FXMEM_DefaultAlloc(size, FXMEM_NONLEAVE); + return FXMEM_DefaultAlloc(size, 1); } // Generic allocate & zero void* CMSEXPORT _cmsMallocZero(cmsContext ContextID, cmsUInt32Number size) { - void* p = FXMEM_DefaultAlloc(size, FXMEM_NONLEAVE); + void* p = FXMEM_DefaultAlloc(size, 1); if (p) FXSYS_memset32(p, 0, size); return p; } @@ -286,7 +286,7 @@ void* CMSEXPORT _cmsCalloc(cmsContext ContextID, cmsUInt32Number num, cmsUInt32N // Generic reallocate void* CMSEXPORT _cmsRealloc(cmsContext ContextID, void* Ptr, cmsUInt32Number size) { - return FXMEM_DefaultRealloc(Ptr, size, FXMEM_NONLEAVE); + return FXMEM_DefaultRealloc(Ptr, size, 1); } // Generic free memory @@ -298,7 +298,7 @@ void CMSEXPORT _cmsFree(cmsContext ContextID, void* Ptr) // Generic block duplication void* CMSEXPORT _cmsDupMem(cmsContext ContextID, const void* Org, cmsUInt32Number size) { - void* p = FXMEM_DefaultAlloc(size, FXMEM_NONLEAVE); + void* p = FXMEM_DefaultAlloc(size, 1); FXSYS_memmove32(p, Org, size); return p; } -- cgit v1.2.3