diff options
author | Tom Sepez <tsepez@chromium.org> | 2016-01-12 08:54:49 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2016-01-12 08:54:49 -0800 |
commit | 067e2b4fe59b70291ee19705ba45575ec39feb9d (patch) | |
tree | 0b1a5b00d5b892f34790fb6805272757b40a7432 /core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp | |
parent | b9bc6b79cba90c5c0e28ab31276029aa0d0c04cb (diff) | |
download | pdfium-067e2b4fe59b70291ee19705ba45575ec39feb9d.tar.xz |
Merget to XFA: Use std::map in CPDF_IndirectObjects
Review URL: https://codereview.chromium.org/1576113003 .
(cherry picked from commit fce548047a44c7015996874452f3e778bf64cad6)
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1579693004 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp index 7353bfab87..d8091e8861 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp @@ -9,7 +9,7 @@ #include "core/include/fpdfapi/fpdf_module.h" CPDF_Document::CPDF_Document(CPDF_Parser* pParser) - : CPDF_IndirectObjects(pParser) { + : CPDF_IndirectObjectHolder(pParser) { ASSERT(pParser); m_pRootDict = NULL; m_pInfoDict = NULL; @@ -332,13 +332,11 @@ FX_BOOL CPDF_Document::IsOwner() const { return !m_pParser || m_pParser->IsOwner(); } FX_BOOL CPDF_Document::IsFormStream(FX_DWORD objnum, FX_BOOL& bForm) const { - { - CPDF_Object* pObj; - if (m_IndirectObjs.Lookup((void*)(uintptr_t)objnum, (void*&)pObj)) { - CPDF_Stream* pStream = pObj->AsStream(); - bForm = pStream && pStream->GetDict()->GetString("Subtype") == "Form"; - return TRUE; - } + auto it = m_IndirectObjs.find(objnum); + if (it != m_IndirectObjs.end()) { + CPDF_Stream* pStream = it->second->AsStream(); + bForm = pStream && pStream->GetDict()->GetString("Subtype") == "Form"; + return TRUE; } if (!m_pParser) { bForm = FALSE; |