| Index: core/src/fxcodec/jbig2/JBig2_Object.cpp
|
| diff --git a/core/src/fxcodec/jbig2/JBig2_Object.cpp b/core/src/fxcodec/jbig2/JBig2_Object.cpp
|
| index ae544d72d5b7d25a408417f5b114c3d3ecbea7ae..1b8d41b438da6937adef388133b22581c9b698cc 100644
|
| --- a/core/src/fxcodec/jbig2/JBig2_Object.cpp
|
| +++ b/core/src/fxcodec/jbig2/JBig2_Object.cpp
|
| @@ -6,71 +6,77 @@
|
|
|
| #include "JBig2_Object.h"
|
| #include "JBig2_Module.h"
|
| -void *CJBig2_Object::operator new(size_t size, CJBig2_Module *pModule, const FX_CHAR* filename, int line)
|
| -{
|
| - CJBig2_Object *p;
|
| - p = (CJBig2_Object *)pModule->JBig2_Malloc((FX_DWORD)size);
|
| - p->m_pModule = pModule;
|
| - return p;
|
| +void* CJBig2_Object::operator new(size_t size,
|
| + CJBig2_Module* pModule,
|
| + const FX_CHAR* filename,
|
| + int line) {
|
| + CJBig2_Object* p;
|
| + p = (CJBig2_Object*)pModule->JBig2_Malloc((FX_DWORD)size);
|
| + p->m_pModule = pModule;
|
| + return p;
|
| }
|
| -void CJBig2_Object::operator delete(void *p, CJBig2_Module *pModule, const FX_CHAR* filename, int line)
|
| -{
|
| - pModule->JBig2_Free(p);
|
| +void CJBig2_Object::operator delete(void* p,
|
| + CJBig2_Module* pModule,
|
| + const FX_CHAR* filename,
|
| + int line) {
|
| + pModule->JBig2_Free(p);
|
| }
|
| -void *CJBig2_Object::operator new(size_t size, CJBig2_Module *pModule)
|
| -{
|
| - CJBig2_Object *p;
|
| - p = (CJBig2_Object *)pModule->JBig2_Malloc((FX_DWORD)size);
|
| - p->m_pModule = pModule;
|
| - return p;
|
| +void* CJBig2_Object::operator new(size_t size, CJBig2_Module* pModule) {
|
| + CJBig2_Object* p;
|
| + p = (CJBig2_Object*)pModule->JBig2_Malloc((FX_DWORD)size);
|
| + p->m_pModule = pModule;
|
| + return p;
|
| }
|
| -void CJBig2_Object::operator delete(void *p)
|
| -{
|
| - if (p) {
|
| - ((CJBig2_Object *)p)->m_pModule->JBig2_Free(p);
|
| - }
|
| +void CJBig2_Object::operator delete(void* p) {
|
| + if (p) {
|
| + ((CJBig2_Object*)p)->m_pModule->JBig2_Free(p);
|
| + }
|
| }
|
| -void CJBig2_Object::operator delete(void *p, CJBig2_Module *pModule)
|
| -{
|
| - pModule->JBig2_Free(p);
|
| +void CJBig2_Object::operator delete(void* p, CJBig2_Module* pModule) {
|
| + pModule->JBig2_Free(p);
|
| }
|
| -void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t unit_size,
|
| - const FX_CHAR* filename, int line)
|
| -{
|
| - void *p;
|
| - uint8_t *pCur, *pEnd;
|
| - p = (uint8_t *)pModule->JBig2_Malloc((FX_DWORD)size);
|
| - pCur = (uint8_t *)p;
|
| - pEnd = pCur + size;
|
| - for(; pCur < pEnd; pCur += unit_size) {
|
| - ((CJBig2_Object *)pCur)->m_pModule = pModule;
|
| - }
|
| - return p;
|
| +void* CJBig2_Object::operator new[](size_t size,
|
| + CJBig2_Module* pModule,
|
| + size_t unit_size,
|
| + const FX_CHAR* filename,
|
| + int line) {
|
| + void* p;
|
| + uint8_t *pCur, *pEnd;
|
| + p = (uint8_t*)pModule->JBig2_Malloc((FX_DWORD)size);
|
| + pCur = (uint8_t*)p;
|
| + pEnd = pCur + size;
|
| + for (; pCur < pEnd; pCur += unit_size) {
|
| + ((CJBig2_Object*)pCur)->m_pModule = pModule;
|
| + }
|
| + return p;
|
| }
|
| -void CJBig2_Object::operator delete[](void *p, CJBig2_Module *pModule, size_t unit_size,
|
| - const FX_CHAR* filename, int line)
|
| -{
|
| - pModule->JBig2_Free(p);
|
| +void CJBig2_Object::operator delete[](void* p,
|
| + CJBig2_Module* pModule,
|
| + size_t unit_size,
|
| + const FX_CHAR* filename,
|
| + int line) {
|
| + pModule->JBig2_Free(p);
|
| }
|
| -void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t unit_size)
|
| -{
|
| - void *p;
|
| - uint8_t *pCur, *pEnd;
|
| - p = (uint8_t *)pModule->JBig2_Malloc((FX_DWORD)size);
|
| - pCur = (uint8_t *)p;
|
| - pEnd = pCur + size;
|
| - for(; pCur < pEnd; pCur += unit_size) {
|
| - ((CJBig2_Object *)pCur)->m_pModule = pModule;
|
| - }
|
| - return p;
|
| +void* CJBig2_Object::operator new[](size_t size,
|
| + CJBig2_Module* pModule,
|
| + size_t unit_size) {
|
| + void* p;
|
| + uint8_t *pCur, *pEnd;
|
| + p = (uint8_t*)pModule->JBig2_Malloc((FX_DWORD)size);
|
| + pCur = (uint8_t*)p;
|
| + pEnd = pCur + size;
|
| + for (; pCur < pEnd; pCur += unit_size) {
|
| + ((CJBig2_Object*)pCur)->m_pModule = pModule;
|
| + }
|
| + return p;
|
| }
|
| -void CJBig2_Object::operator delete[](void* p)
|
| -{
|
| - if (p) {
|
| - ((CJBig2_Object *)p)->m_pModule->JBig2_Free(p);
|
| - }
|
| +void CJBig2_Object::operator delete[](void* p) {
|
| + if (p) {
|
| + ((CJBig2_Object*)p)->m_pModule->JBig2_Free(p);
|
| + }
|
| }
|
| -void CJBig2_Object::operator delete[](void *p, CJBig2_Module *pModule, size_t unit_size)
|
| -{
|
| - pModule->JBig2_Free(p);
|
| +void CJBig2_Object::operator delete[](void* p,
|
| + CJBig2_Module* pModule,
|
| + size_t unit_size) {
|
| + pModule->JBig2_Free(p);
|
| }
|
|
|