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 . --- fpdfsdk/src/fpdfppo.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/src/fpdfppo.cpp') diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp index 6521258485..c37ecca490 100644 --- a/fpdfsdk/src/fpdfppo.cpp +++ b/fpdfsdk/src/fpdfppo.cpp @@ -186,9 +186,8 @@ CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag( return NULL; CPDF_Object* pType = pDict->GetElement("Type")->GetDirect(); - if (!pType || pType->GetType() != PDFOBJ_NAME) - return NULL; - + if (!ToName(pType)) + return nullptr; if (pType->GetString().Compare("Page")) return NULL; if (!pDict->KeyExist("Parent")) -- cgit v1.2.3