| OLD | NEW |
| 1 // Copyright 2014 PDFium Authors. All rights reserved. | 1 // Copyright 2014 PDFium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com |
| 6 | 6 |
| 7 #include "JBig2_Object.h" | 7 #include "JBig2_Object.h" |
| 8 #include "JBig2_Module.h" | 8 #include "JBig2_Module.h" |
| 9 void *CJBig2_Object::operator new(size_t size, CJBig2_Module *pModule, const FX_
CHAR* filename, int line) | 9 void* CJBig2_Object::operator new(size_t size, |
| 10 { | 10 CJBig2_Module* pModule, |
| 11 CJBig2_Object *p; | 11 const FX_CHAR* filename, |
| 12 p = (CJBig2_Object *)pModule->JBig2_Malloc((FX_DWORD)size); | 12 int line) { |
| 13 p->m_pModule = pModule; | 13 CJBig2_Object* p; |
| 14 return p; | 14 p = (CJBig2_Object*)pModule->JBig2_Malloc((FX_DWORD)size); |
| 15 p->m_pModule = pModule; |
| 16 return p; |
| 15 } | 17 } |
| 16 void CJBig2_Object::operator delete(void *p, CJBig2_Module *pModule, const FX_CH
AR* filename, int line) | 18 void CJBig2_Object::operator delete(void* p, |
| 17 { | 19 CJBig2_Module* pModule, |
| 18 pModule->JBig2_Free(p); | 20 const FX_CHAR* filename, |
| 21 int line) { |
| 22 pModule->JBig2_Free(p); |
| 19 } | 23 } |
| 20 void *CJBig2_Object::operator new(size_t size, CJBig2_Module *pModule) | 24 void* CJBig2_Object::operator new(size_t size, CJBig2_Module* pModule) { |
| 21 { | 25 CJBig2_Object* p; |
| 22 CJBig2_Object *p; | 26 p = (CJBig2_Object*)pModule->JBig2_Malloc((FX_DWORD)size); |
| 23 p = (CJBig2_Object *)pModule->JBig2_Malloc((FX_DWORD)size); | 27 p->m_pModule = pModule; |
| 24 p->m_pModule = pModule; | 28 return p; |
| 25 return p; | |
| 26 } | 29 } |
| 27 void CJBig2_Object::operator delete(void *p) | 30 void CJBig2_Object::operator delete(void* p) { |
| 28 { | 31 if (p) { |
| 29 if (p) { | 32 ((CJBig2_Object*)p)->m_pModule->JBig2_Free(p); |
| 30 ((CJBig2_Object *)p)->m_pModule->JBig2_Free(p); | 33 } |
| 31 } | |
| 32 } | 34 } |
| 33 void CJBig2_Object::operator delete(void *p, CJBig2_Module *pModule) | 35 void CJBig2_Object::operator delete(void* p, CJBig2_Module* pModule) { |
| 34 { | 36 pModule->JBig2_Free(p); |
| 35 pModule->JBig2_Free(p); | |
| 36 } | 37 } |
| 37 void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t
unit_size, | 38 void* CJBig2_Object::operator new[](size_t size, |
| 38 const FX_CHAR* filename, int line) | 39 CJBig2_Module* pModule, |
| 39 { | 40 size_t unit_size, |
| 40 void *p; | 41 const FX_CHAR* filename, |
| 41 uint8_t *pCur, *pEnd; | 42 int line) { |
| 42 p = (uint8_t *)pModule->JBig2_Malloc((FX_DWORD)size); | 43 void* p; |
| 43 pCur = (uint8_t *)p; | 44 uint8_t *pCur, *pEnd; |
| 44 pEnd = pCur + size; | 45 p = (uint8_t*)pModule->JBig2_Malloc((FX_DWORD)size); |
| 45 for(; pCur < pEnd; pCur += unit_size) { | 46 pCur = (uint8_t*)p; |
| 46 ((CJBig2_Object *)pCur)->m_pModule = pModule; | 47 pEnd = pCur + size; |
| 47 } | 48 for (; pCur < pEnd; pCur += unit_size) { |
| 48 return p; | 49 ((CJBig2_Object*)pCur)->m_pModule = pModule; |
| 50 } |
| 51 return p; |
| 49 } | 52 } |
| 50 void CJBig2_Object::operator delete[](void *p, CJBig2_Module *pModule, size_t un
it_size, | 53 void CJBig2_Object::operator delete[](void* p, |
| 51 const FX_CHAR* filename, int line) | 54 CJBig2_Module* pModule, |
| 52 { | 55 size_t unit_size, |
| 53 pModule->JBig2_Free(p); | 56 const FX_CHAR* filename, |
| 57 int line) { |
| 58 pModule->JBig2_Free(p); |
| 54 } | 59 } |
| 55 void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t
unit_size) | 60 void* CJBig2_Object::operator new[](size_t size, |
| 56 { | 61 CJBig2_Module* pModule, |
| 57 void *p; | 62 size_t unit_size) { |
| 58 uint8_t *pCur, *pEnd; | 63 void* p; |
| 59 p = (uint8_t *)pModule->JBig2_Malloc((FX_DWORD)size); | 64 uint8_t *pCur, *pEnd; |
| 60 pCur = (uint8_t *)p; | 65 p = (uint8_t*)pModule->JBig2_Malloc((FX_DWORD)size); |
| 61 pEnd = pCur + size; | 66 pCur = (uint8_t*)p; |
| 62 for(; pCur < pEnd; pCur += unit_size) { | 67 pEnd = pCur + size; |
| 63 ((CJBig2_Object *)pCur)->m_pModule = pModule; | 68 for (; pCur < pEnd; pCur += unit_size) { |
| 64 } | 69 ((CJBig2_Object*)pCur)->m_pModule = pModule; |
| 65 return p; | 70 } |
| 71 return p; |
| 66 } | 72 } |
| 67 void CJBig2_Object::operator delete[](void* p) | 73 void CJBig2_Object::operator delete[](void* p) { |
| 68 { | 74 if (p) { |
| 69 if (p) { | 75 ((CJBig2_Object*)p)->m_pModule->JBig2_Free(p); |
| 70 ((CJBig2_Object *)p)->m_pModule->JBig2_Free(p); | 76 } |
| 71 } | |
| 72 } | 77 } |
| 73 void CJBig2_Object::operator delete[](void *p, CJBig2_Module *pModule, size_t un
it_size) | 78 void CJBig2_Object::operator delete[](void* p, |
| 74 { | 79 CJBig2_Module* pModule, |
| 75 pModule->JBig2_Free(p); | 80 size_t unit_size) { |
| 81 pModule->JBig2_Free(p); |
| 76 } | 82 } |
| OLD | NEW |