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

Side by Side Diff: core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 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
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 "core/fpdfapi/fpdf_cmaps/cmap_int.h" 7 #include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
8 8
9 #include "core/fpdfapi/fpdf_font/font_int.h" 9 #include "core/fpdfapi/fpdf_font/font_int.h"
10 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" 10 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
11 #include "core/fpdfapi/include/cpdf_modulemgr.h" 11 #include "core/fpdfapi/include/cpdf_modulemgr.h"
12 12
13 void FPDFAPI_FindEmbeddedCMap(const char* name, 13 void FPDFAPI_FindEmbeddedCMap(const char* name,
14 int charset, 14 int charset,
15 int coding, 15 int coding,
16 const FXCMAP_CMap*& pMap) { 16 const FXCMAP_CMap*& pMap) {
17 pMap = NULL; 17 pMap = nullptr;
18 CPDF_FontGlobals* pFontGlobals = 18 CPDF_FontGlobals* pFontGlobals =
19 CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); 19 CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals();
20 const FXCMAP_CMap* pCMaps = 20 const FXCMAP_CMap* pCMaps =
21 pFontGlobals->m_EmbeddedCharsets[charset].m_pMapList; 21 pFontGlobals->m_EmbeddedCharsets[charset].m_pMapList;
22 for (uint32_t i = 0; i < pFontGlobals->m_EmbeddedCharsets[charset].m_Count; 22 for (uint32_t i = 0; i < pFontGlobals->m_EmbeddedCharsets[charset].m_Count;
23 i++) { 23 i++) {
24 if (FXSYS_strcmp(name, pCMaps[i].m_Name)) 24 if (FXSYS_strcmp(name, pCMaps[i].m_Name))
25 continue; 25 continue;
26 pMap = &pCMaps[i]; 26 pMap = &pCMaps[i];
27 break; 27 break;
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 } 182 }
183 183
184 void FPDFAPI_LoadCID2UnicodeMap(CIDSet charset, 184 void FPDFAPI_LoadCID2UnicodeMap(CIDSet charset,
185 const uint16_t*& pMap, 185 const uint16_t*& pMap,
186 uint32_t& count) { 186 uint32_t& count) {
187 CPDF_FontGlobals* pFontGlobals = 187 CPDF_FontGlobals* pFontGlobals =
188 CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); 188 CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals();
189 pMap = pFontGlobals->m_EmbeddedToUnicodes[charset].m_pMap; 189 pMap = pFontGlobals->m_EmbeddedToUnicodes[charset].m_pMap;
190 count = pFontGlobals->m_EmbeddedToUnicodes[charset].m_Count; 190 count = pFontGlobals->m_EmbeddedToUnicodes[charset].m_Count;
191 } 191 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp ('k') | core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698