summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2015-10-26 15:58:42 -0400
committerDan Sinclair <dsinclair@chromium.org>2015-10-26 15:58:42 -0400
commit6ee3484bcb413f4cce303e237fe15e2bdaf51ade (patch)
tree89207598714eda2da04af966a013c905a1c63dcf /core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp
parent7e155865c90cc1115cc7193b7646a341d8f9093e (diff)
downloadpdfium-6ee3484bcb413f4cce303e237fe15e2bdaf51ade.tar.xz
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 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp')
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp13
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 5333fe8087..67c18f8ae0 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp
@@ -190,9 +190,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;
}
@@ -308,13 +307,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;