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

Side by Side Diff: core/src/fxge/ge/fx_ge_fontmap.cpp

Issue 1297713003: Don't bother checking pointers before delete[] and FX_Free(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: rebase Created 5 years, 4 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/fxge/ge/fx_ge_font.cpp ('k') | core/src/fxge/ge/fx_ge_path.cpp » ('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 <limits> 7 #include <limits>
8 8
9 #include "../../../include/fxge/fx_ge.h" 9 #include "../../../include/fxge/fx_ge.h"
10 #include "../../../include/fxge/fx_freetype.h" 10 #include "../../../include/fxge/fx_freetype.h"
(...skipping 15 matching lines...) Expand all
26 if (m_Type == 1) { 26 if (m_Type == 1) {
27 if (m_SingleFace.m_pFace) { 27 if (m_SingleFace.m_pFace) {
28 FXFT_Done_Face(m_SingleFace.m_pFace); 28 FXFT_Done_Face(m_SingleFace.m_pFace);
29 } 29 }
30 } else if (m_Type == 2) { 30 } else if (m_Type == 2) {
31 for (int i = 0; i < 16; i++) 31 for (int i = 0; i < 16; i++)
32 if (m_TTCFace.m_pFaces[i]) { 32 if (m_TTCFace.m_pFaces[i]) {
33 FXFT_Done_Face(m_TTCFace.m_pFaces[i]); 33 FXFT_Done_Face(m_TTCFace.m_pFaces[i]);
34 } 34 }
35 } 35 }
36 if (m_pFontData) { 36 FX_Free(m_pFontData);
37 FX_Free(m_pFontData);
38 }
39 } 37 }
40 FX_BOOL CTTFontDesc::ReleaseFace(FXFT_Face face) { 38 FX_BOOL CTTFontDesc::ReleaseFace(FXFT_Face face) {
41 if (m_Type == 1) { 39 if (m_Type == 1) {
42 if (m_SingleFace.m_pFace != face) { 40 if (m_SingleFace.m_pFace != face) {
43 return FALSE; 41 return FALSE;
44 } 42 }
45 } else if (m_Type == 2) { 43 } else if (m_Type == 2) {
46 int i; 44 int i;
47 for (i = 0; i < 16; i++) 45 for (i = 0; i < 16; i++)
48 if (m_TTCFace.m_pFaces[i] == face) { 46 if (m_TTCFace.m_pFaces[i] == face) {
(...skipping 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 if (hFont == NULL) { 1498 if (hFont == NULL) {
1501 return FALSE; 1499 return FALSE;
1502 } 1500 }
1503 CFX_FontFaceInfo* pFont = (CFX_FontFaceInfo*)hFont; 1501 CFX_FontFaceInfo* pFont = (CFX_FontFaceInfo*)hFont;
1504 name = pFont->m_FaceName; 1502 name = pFont->m_FaceName;
1505 return TRUE; 1503 return TRUE;
1506 } 1504 }
1507 FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset) { 1505 FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset) {
1508 return FALSE; 1506 return FALSE;
1509 } 1507 }
OLDNEW
« no previous file with comments | « core/src/fxge/ge/fx_ge_font.cpp ('k') | core/src/fxge/ge/fx_ge_path.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698