summaryrefslogtreecommitdiff
path: root/core/src/fpdfdoc
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-12-10 15:03:16 -0800
committerTom Sepez <tsepez@chromium.org>2015-12-10 15:03:16 -0800
commit7db2a535f163e7ce5995da12161ebd0214f0f75a (patch)
tree0011af492c814606716cd62f0f6132ff83783c75 /core/src/fpdfdoc
parentf32c969bce6743fca1e7ff796b54a1692d26d7f0 (diff)
downloadpdfium-7db2a535f163e7ce5995da12161ebd0214f0f75a.tar.xz
Replace several more CFX_MapPtrToPtr with std::set or std::map
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1520643002 .
Diffstat (limited to 'core/src/fpdfdoc')
-rw-r--r--core/src/fpdfdoc/doc_annot.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp
index 0765acdf6e..26ea45fd9d 100644
--- a/core/src/fpdfdoc/doc_annot.cpp
+++ b/core/src/fpdfdoc/doc_annot.cpp
@@ -124,14 +124,10 @@ CPDF_Annot::~CPDF_Annot() {
ClearCachedAP();
}
void CPDF_Annot::ClearCachedAP() {
- FX_POSITION pos = m_APMap.GetStartPosition();
- while (pos) {
- void* pForm;
- void* pObjects;
- m_APMap.GetNextAssoc(pos, pForm, pObjects);
- delete (CPDF_PageObjects*)pObjects;
+ for (const auto& pair : m_APMap) {
+ delete pair.second;
}
- m_APMap.RemoveAll();
+ m_APMap.clear();
}
CFX_ByteString CPDF_Annot::GetSubType() const {
return m_sSubtype;
@@ -192,14 +188,14 @@ CPDF_Form* CPDF_Annot::GetAPForm(const CPDF_Page* pPage, AppearanceMode mode) {
if (!pStream)
return nullptr;
- void* pForm;
- if (m_APMap.Lookup(pStream, pForm))
- return static_cast<CPDF_Form*>(pForm);
+ auto it = m_APMap.find(pStream);
+ if (it != m_APMap.end())
+ return it->second;
CPDF_Form* pNewForm =
new CPDF_Form(m_pList->GetDocument(), pPage->m_pResources, pStream);
pNewForm->ParseContent(nullptr, nullptr, nullptr, nullptr);
- m_APMap.SetAt(pStream, pNewForm);
+ m_APMap[pStream] = pNewForm;
return pNewForm;
}