diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-26 16:54:39 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-26 16:54:39 -0400 |
| commit | bf81c14cdb2b336a62f97119315f6bc43502e840 (patch) | |
| tree | c9bc0f23a2cc60307b77a69851733ed85c87196f /core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp | |
| parent | 15ce59a0f34278b6b222675c77b25e3e0c50139f (diff) | |
| download | pdfium-bf81c14cdb2b336a62f97119315f6bc43502e840.tar.xz | |
Merge to XFA: Revert "Revert "Add type cast definitions for CPDF_Reference.""
This reverts commit 7e155865c90cc1115cc7193b7646a341d8f9093e.
Add type cast definitions for CPDF_Reference.
This Cl adds ToReference, CPDF_Object::AsReference and CPDF_Object::IsReference
and updates the src to use them as needed.
BUG=pdfium:201
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1418923005 .
(cherry picked from commit 6ee3484bcb413f4cce303e237fe15e2bdaf51ade)
Review URL: https://codereview.chromium.org/1410073007 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp index 34f4b3c671..3b77fb275b 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp @@ -189,9 +189,8 @@ int CPDF_Document::_FindPageIndex(CPDF_Dictionary* pNode, } if (count && count == pKidList->GetCount()) { for (FX_DWORD i = 0; i < count; i++) { - CPDF_Object* pKid = pKidList->GetElement(i); - if (pKid && pKid->GetType() == PDFOBJ_REFERENCE) { - if (((CPDF_Reference*)pKid)->GetRefObjNum() == objnum) { + if (CPDF_Reference* pKid = ToReference(pKidList->GetElement(i))) { + if (pKid->GetRefObjNum() == objnum) { m_PageList.SetAt(index + i, objnum); return index + i; } @@ -307,13 +306,9 @@ FX_BOOL CPDF_Document::IsContentUsedElsewhere(FX_DWORD objnum, if (pContents->GetDirectType() == PDFOBJ_ARRAY) { CPDF_Array* pArray = pContents->GetDirect()->AsArray(); for (FX_DWORD j = 0; j < pArray->GetCount(); j++) { - CPDF_Object* pRef = pArray->GetElement(j); - if (pRef == NULL || pRef->GetType() != PDFOBJ_REFERENCE) { - continue; - } - if (((CPDF_Reference*)pRef)->GetRefObjNum() == objnum) { + CPDF_Reference* pRef = ToReference(pArray->GetElement(j)); + if (pRef && pRef->GetRefObjNum() == objnum) return TRUE; - } } } else if (pContents->GetObjNum() == objnum) { return TRUE; |