Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: core/src/fxcodec/jbig2/JBig2_Object.cpp

Issue 1172793002: Merge to XFA: Use stdint.h types throughout PDFium. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/src/fxcodec/jbig2/JBig2_Module.h ('k') | core/src/fxcodec/jbig2/JBig2_Page.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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, FX_LPCSTR filename, int line) 9 void *CJBig2_Object::operator new(size_t size, CJBig2_Module *pModule, FX_LPCSTR filename, int line)
10 { 10 {
(...skipping 18 matching lines...) Expand all
29 ((CJBig2_Object *)p)->m_pModule->JBig2_Free(p); 29 ((CJBig2_Object *)p)->m_pModule->JBig2_Free(p);
30 } 30 }
31 void CJBig2_Object::operator delete(void *p, CJBig2_Module *pModule) 31 void CJBig2_Object::operator delete(void *p, CJBig2_Module *pModule)
32 { 32 {
33 pModule->JBig2_Free(p); 33 pModule->JBig2_Free(p);
34 } 34 }
35 void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t unit_size, 35 void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t unit_size,
36 FX_LPCSTR filename, int line) 36 FX_LPCSTR filename, int line)
37 { 37 {
38 void *p; 38 void *p;
39 FX_BYTE *pCur, *pEnd; 39 uint8_t *pCur, *pEnd;
40 p = (FX_BYTE *)pModule->JBig2_Malloc((FX_DWORD)size); 40 p = (uint8_t *)pModule->JBig2_Malloc((FX_DWORD)size);
41 pCur = (FX_BYTE *)p; 41 pCur = (uint8_t *)p;
42 pEnd = pCur + size; 42 pEnd = pCur + size;
43 for(; pCur < pEnd; pCur += unit_size) { 43 for(; pCur < pEnd; pCur += unit_size) {
44 ((CJBig2_Object *)pCur)->m_pModule = pModule; 44 ((CJBig2_Object *)pCur)->m_pModule = pModule;
45 } 45 }
46 return p; 46 return p;
47 } 47 }
48 void CJBig2_Object::operator delete[](void *p, CJBig2_Module *pModule, size_t un it_size, 48 void CJBig2_Object::operator delete[](void *p, CJBig2_Module *pModule, size_t un it_size,
49 FX_LPCSTR filename, int line) 49 FX_LPCSTR filename, int line)
50 { 50 {
51 pModule->JBig2_Free(p); 51 pModule->JBig2_Free(p);
52 } 52 }
53 void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t unit_size) 53 void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t unit_size)
54 { 54 {
55 void *p; 55 void *p;
56 FX_BYTE *pCur, *pEnd; 56 uint8_t *pCur, *pEnd;
57 p = (FX_BYTE *)pModule->JBig2_Malloc((FX_DWORD)size); 57 p = (uint8_t *)pModule->JBig2_Malloc((FX_DWORD)size);
58 pCur = (FX_BYTE *)p; 58 pCur = (uint8_t *)p;
59 pEnd = pCur + size; 59 pEnd = pCur + size;
60 for(; pCur < pEnd; pCur += unit_size) { 60 for(; pCur < pEnd; pCur += unit_size) {
61 ((CJBig2_Object *)pCur)->m_pModule = pModule; 61 ((CJBig2_Object *)pCur)->m_pModule = pModule;
62 } 62 }
63 return p; 63 return p;
64 } 64 }
65 void CJBig2_Object::operator delete[](void* p) 65 void CJBig2_Object::operator delete[](void* p)
66 { 66 {
67 ((CJBig2_Object *)p)->m_pModule->JBig2_Free(p); 67 ((CJBig2_Object *)p)->m_pModule->JBig2_Free(p);
68 } 68 }
69 void CJBig2_Object::operator delete[](void *p, CJBig2_Module *pModule, size_t un it_size) 69 void CJBig2_Object::operator delete[](void *p, CJBig2_Module *pModule, size_t un it_size)
70 { 70 {
71 pModule->JBig2_Free(p); 71 pModule->JBig2_Free(p);
72 } 72 }
OLDNEW
« no previous file with comments | « core/src/fxcodec/jbig2/JBig2_Module.h ('k') | core/src/fxcodec/jbig2/JBig2_Page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698