diff options
Diffstat (limited to 'core/src/fpdfdoc/doc_utils.cpp')
| -rw-r--r-- | core/src/fpdfdoc/doc_utils.cpp | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/core/src/fpdfdoc/doc_utils.cpp b/core/src/fpdfdoc/doc_utils.cpp index 7d3fdf2f23..1ed0017078 100644 --- a/core/src/fpdfdoc/doc_utils.cpp +++ b/core/src/fpdfdoc/doc_utils.cpp @@ -290,8 +290,9 @@ FX_DWORD CountInterFormFonts(CPDF_Dictionary* pFormDict) { if (pObj == NULL) { continue; } - if (CPDF_Dictionary* pDirect = ToDictionary(pObj->GetDirect())) { - if (pDirect->GetString("Type") == "Font") { + CPDF_Object* pDirect = pObj->GetDirect(); + if (pDirect != NULL && pDirect->GetType() == PDFOBJ_DICTIONARY) { + if (((CPDF_Dictionary*)pDirect)->GetString("Type") == "Font") { dwCount++; } } @@ -322,11 +323,14 @@ CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict, if (pObj == NULL) { continue; } - CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect()); - if (!pElement) + CPDF_Object* pDirect = pObj->GetDirect(); + if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) { continue; - if (pElement->GetString("Type") != "Font") + } + CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect; + if (pElement->GetString("Type") != "Font") { continue; + } if (dwCount == index) { csNameTag = csKey; return pDocument->LoadFont(pElement); @@ -382,16 +386,18 @@ CPDF_Font* GetInterFormFont(CPDF_Dictionary* pFormDict, if (pObj == NULL) { continue; } - CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect()); - if (!pElement) + CPDF_Object* pDirect = pObj->GetDirect(); + if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) { continue; - if (pElement->GetString("Type") != "Font") + } + CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect; + if (pElement->GetString("Type") != "Font") { continue; - + } CPDF_Font* pFind = pDocument->LoadFont(pElement); - if (!pFind) + if (pFind == NULL) { continue; - + } CFX_ByteString csBaseFont; csBaseFont = pFind->GetBaseFont(); csBaseFont.Remove(' '); @@ -425,11 +431,14 @@ CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict, if (pObj == NULL) { continue; } - CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect()); - if (!pElement) + CPDF_Object* pDirect = pObj->GetDirect(); + if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) { continue; - if (pElement->GetString("Type") != "Font") + } + CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect; + if (pElement->GetString("Type") != "Font") { continue; + } CPDF_Font* pFind = pDocument->LoadFont(pElement); if (pFind == NULL) { continue; @@ -483,9 +492,11 @@ FX_BOOL FindInterFormFont(CPDF_Dictionary* pFormDict, if (pObj == NULL) { continue; } - CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect()); - if (!pElement) + CPDF_Object* pDirect = pObj->GetDirect(); + if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) { continue; + } + CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect; if (pElement->GetString("Type") != "Font") { continue; } @@ -523,9 +534,11 @@ FX_BOOL FindInterFormFont(CPDF_Dictionary* pFormDict, if (pObj == NULL) { continue; } - CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect()); - if (!pElement) + CPDF_Object* pDirect = pObj->GetDirect(); + if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY) { continue; + } + CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect; if (pElement->GetString("Type") != "Font") { continue; } |