diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 15:46:10 -0400 |
---|---|---|
committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-21 15:46:10 -0400 |
commit | 710c909117da4297e5a9508bedb306fc5c49eb36 (patch) | |
tree | 53c9bf4471ebe72977773ec8151b4ae44c3975bb /core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | |
parent | 316eb864137a0b8eeb0d0d4d698ba83f4946a89c (diff) | |
download | pdfium-710c909117da4297e5a9508bedb306fc5c49eb36.tar.xz |
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 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index 036b293792..f6e1ee895a 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -3813,8 +3813,9 @@ int32_t CPDF_DataAvail::CheckCrossRefStream(IFX_DownloadHints* pHints, return 0; } CPDF_Dictionary* pDict = pObj->GetDict(); - CPDF_Object* pName = pDict ? pDict->GetElement(FX_BSTRC("Type")) : NULL; - if (pName && pName->GetType() == PDFOBJ_NAME) { + CPDF_Name* pName = + ToName(pDict ? pDict->GetElement(FX_BSTRC("Type")) : nullptr); + if (pName) { if (pName->GetString() == FX_BSTRC("XRef")) { m_Pos += m_parser.m_Syntax.SavePos(); xref_offset = pObj->GetDict()->GetInteger(FX_BSTRC("Prev")); |