diff options
Diffstat (limited to 'core/src/fxcodec/jbig2/JBig2_Object.cpp')
-rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Object.cpp | 116 |
1 files changed, 61 insertions, 55 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_Object.cpp b/core/src/fxcodec/jbig2/JBig2_Object.cpp index 1429a91644..f1e894321c 100644 --- a/core/src/fxcodec/jbig2/JBig2_Object.cpp +++ b/core/src/fxcodec/jbig2/JBig2_Object.cpp @@ -1,72 +1,78 @@ // Copyright 2014 PDFium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. - + // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #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) -{ - ((CJBig2_Object *)p)->m_pModule->JBig2_Free(p); +void CJBig2_Object::operator delete(void* 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) -{ - ((CJBig2_Object *)p)->m_pModule->JBig2_Free(p); +void CJBig2_Object::operator delete[](void* 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); } |