Replace several more CFX_MapPtrToPtr with std::set or std::map

core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fpdfapi/fpdf_parser.h"
 
 #include "core/include/fxcrt/fx_string.h"
 
@@ skipping 209 matching lines @@
 }
 CPDF_Object* CPDF_Object::GetDirect() const {
   const CPDF_Reference* pRef = AsReference();
   if (!pRef)
     return const_cast<CPDF_Object*>(this);
   if (!pRef->m_pObjList)
     return nullptr;
   return pRef->m_pObjList->GetIndirectObject(pRef->GetRefObjNum());
 }
 CPDF_Object* CPDF_Object::Clone(FX_BOOL bDirect) const {
-  CFX_MapPtrToPtr visited;
+  std::set<FX_DWORD> visited;
   return CloneInternal(bDirect, &visited);
 }
 CPDF_Object* CPDF_Object::CloneInternal(FX_BOOL bDirect,
-                                        CFX_MapPtrToPtr* visited) const {
+                                        std::set<FX_DWORD>* visited) const {
   switch (m_Type) {
     case PDFOBJ_BOOLEAN:
       return new CPDF_Boolean(AsBoolean()->m_bValue);
     case PDFOBJ_NUMBER: {
       const CPDF_Number* pThis = AsNumber();
       return new CPDF_Number(pThis->m_bInteger ? pThis->m_Integer
                                                : pThis->m_Float);
     }
     case PDFOBJ_STRING: {
       const CPDF_String* pString = AsString();
@@ skipping 33 matching lines @@
       FX_DWORD streamSize = acc.GetSize();
       CPDF_Dictionary* pDict = pThis->GetDict();
       if (pDict) {
         pDict = ToDictionary(pDict->CloneInternal(bDirect, visited));
       }
       return new CPDF_Stream(acc.DetachData(), streamSize, pDict);
     }
     case PDFOBJ_REFERENCE: {
       const CPDF_Reference* pRef = AsReference();
       FX_DWORD obj_num = pRef->GetRefObjNum();
-      if (bDirect && !visited->GetValueAt((void*)(uintptr_t)obj_num)) {
-        visited->SetAt((void*)(uintptr_t)obj_num, (void*)1);
+      if (bDirect && visited->find(obj_num) == visited->end()) {

[Lei Zhang, 2015/12/10 22:28:03]

Someday I'm going to sneak ContainsKey() into PDFium and fix all these.

+        visited->insert(obj_num);
         if (!pRef->GetDirect())
           return nullptr;
 
         return pRef->GetDirect()->CloneInternal(TRUE, visited);
       }
       return new CPDF_Reference(pRef->m_pObjList, obj_num);
     }
   }
   return NULL;
 }
@@ skipping 872 matching lines @@
   }
   pObj->m_ObjNum = objnum;
   m_IndirectObjs.SetAt((void*)(uintptr_t)objnum, pObj);
   if (m_LastObjNum < objnum) {
     m_LastObjNum = objnum;
   }
 }
 FX_DWORD CPDF_IndirectObjects::GetLastObjNum() const {
   return m_LastObjNum;
 }