Remove custom memory manager

core/src/fxcodec/lcms2/lcms2-2.6/src/cmserr.c

 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
 //  Copyright (c) 1998-2012 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
 // to deal in the Software without restriction, including without limitation
 // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // and/or sell copies of the Software, and to permit persons to whom the Software
@@ skipping 244 matching lines @@
 #include "../../../../../include/fxcrt/fx_memory.h"
 
 cmsBool  _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plugin)
 {
         return TRUE;
 }
 
 // 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;
 }
 
 // Generic calloc
 void* CMSEXPORT _cmsCalloc(cmsContext ContextID, cmsUInt32Number num, cmsUInt32Number size)
 {
         cmsUInt32Number total = num * size;
         if (total == 0 || total / size != num || total >= 512 * 1024 * 1024)
                 return NULL;
 
         return _cmsMallocZero(ContextID, num * size);
 }
 
 // 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
 void CMSEXPORT _cmsFree(cmsContext ContextID, void* Ptr)
 {
         if (Ptr != NULL) FXMEM_DefaultFree(Ptr, 0);
 }
 
 // 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;
 }
 
 _cmsMemPluginChunkType _cmsMemPluginChunk = {_cmsMalloc, _cmsMallocZero, _cmsFree, 
                                                  _cmsRealloc, _cmsCalloc,    _cmsDupMem
                                             };
 
 void _cmsAllocMemPluginChunk(struct _cmsContext_struct* ctx, const struct _cmsContext_struct* src)
 {
@@ skipping 386 matching lines @@
 
 void CMSEXPORT _cmsUnlockMutex(cmsContext ContextID, void* mtx)
 {
     _cmsMutexPluginChunkType* ptr = (_cmsMutexPluginChunkType*) _cmsContextGetClientChunk(ContextID, MutexPlugin);
 
     if (ptr ->UnlockMutexPtr != NULL) {
 
         ptr ->UnlockMutexPtr(ContextID, mtx);
     }
 }