Index: core/src/fpdfapi/fpdf_font/fpdf_font.cpp |
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp |
index 10ca3113e3e5c9fb53b170f1a8b650d3d3b6052e..9954efcc5d670088fa8465455444128ec0b30608 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(); |