From 710c909117da4297e5a9508bedb306fc5c49eb36 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 21 Oct 2015 15:46:10 -0400 Subject: Merge to XFA: 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 . (cherry picked from commit 1c77edb7b34e03787605b7965784cea38ef9f1d7) Review URL: https://codereview.chromium.org/1417033004 . --- core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp') diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 5095f1a74c..81ec84b2db 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() -- cgit v1.2.3