diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 13:55:38 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 13:55:38 -0400 |
| commit | 1c77edb7b34e03787605b7965784cea38ef9f1d7 (patch) | |
| tree | 621c8d67cb3d5fd72bceed59e2e5a39c6e037fbe /core/src/fpdfapi/fpdf_font | |
| parent | 53d3ab125ef583be8cfac907b308a6551b93067a (diff) | |
| download | pdfium-1c77edb7b34e03787605b7965784cea38ef9f1d7.tar.xz | |
Add type cast definitions for CPDF_Name.
This Cl adds ToName, CPDF_Object::AsName and CPDF_Object::IsName and
updates the src to use them as needed.
BUG=pdfium:201
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1417823005 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_font')
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font.cpp | 13 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 8 |
2 files changed, 9 insertions, 12 deletions
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index 10ca3113e3..9954efcc5d 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -728,7 +728,7 @@ void CPDF_Font::LoadPDFEncoding(CPDF_Object* pEncoding, } return; } - if (pEncoding->GetType() == PDFOBJ_NAME) { + if (pEncoding->IsName()) { if (iBaseEncoding == PDFFONT_ENCODING_ADOBE_SYMBOL || iBaseEncoding == PDFFONT_ENCODING_ZAPFDINGBATS) { return; @@ -770,13 +770,12 @@ void CPDF_Font::LoadPDFEncoding(CPDF_Object* pEncoding, FX_DWORD cur_code = 0; for (FX_DWORD i = 0; i < pDiffs->GetCount(); i++) { CPDF_Object* pElement = pDiffs->GetElementValue(i); - if (pElement == NULL) { + if (!pElement) continue; - } - if (pElement->GetType() == PDFOBJ_NAME) { - if (cur_code < 256) { - pCharNames[cur_code] = ((CPDF_Name*)pElement)->GetString(); - } + + if (CPDF_Name* pName = pElement->AsName()) { + if (cur_code < 256) + pCharNames[cur_code] = pName->GetString(); cur_code++; } else { cur_code = pElement->GetInteger(); diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 0f7d128786..6ccc4a345b 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -1206,11 +1206,9 @@ FX_BOOL CPDF_CIDFont::_Load() { return FALSE; } CFX_ByteString subtype = pCIDFontDict->GetString(FX_BSTRC("Subtype")); - m_bType1 = FALSE; - if (subtype == FX_BSTRC("CIDFontType0")) { - m_bType1 = TRUE; - } - if (pEncoding->GetType() == PDFOBJ_NAME) { + m_bType1 = (subtype == FX_BSTRC("CIDFontType0")); + + if (pEncoding->IsName()) { CFX_ByteString cmap = pEncoding->GetString(); m_pCMap = CPDF_ModuleMgr::Get() |