Remove default argument from CPDF_Dictionary::SetAt().

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 "../../../include/fpdfapi/fpdf_parser.h"
 #include "../../../include/fxcrt/fx_string.h"
 
 // static
@@ skipping 720 matching lines @@
   CPDF_Array* pArray = GetArray(key);
   if (pArray) {
     matrix = pArray->GetMatrix();
   }
   return matrix;
 }
 FX_BOOL CPDF_Dictionary::KeyExist(const CFX_ByteStringC& key) const {
   void* value;
   return m_Map.Lookup(key, value);
 }
-void CPDF_Dictionary::SetAt(const CFX_ByteStringC& key,
-                            CPDF_Object* pObj,
-                            CPDF_IndirectObjects* pObjs) {
-  ASSERT(m_Type == PDFOBJ_DICTIONARY);
-  CPDF_Object* p = NULL;
-  m_Map.Lookup(key, (void*&)p);
-  if (p == pObj) {
+
+void CPDF_Dictionary::SetAt(const CFX_ByteStringC& key, CPDF_Object* pObj) {
+  SetAtWithIndirect(key, pObj, nullptr);
+}
+
+void CPDF_Dictionary::SetAtWithIndirect(const CFX_ByteStringC& key,
+                                        CPDF_Object* pObj,
+                                        CPDF_IndirectObjects* pObjs) {
+  ASSERT(IsDictionary());
+  CPDF_Object* pExisting = nullptr;
+  m_Map.Lookup(key, (void*&)pExisting);

[Tom Sepez, 2015/10/24 16:50:01]

nit: you know this cast is my favorite pet peeve ...

[Lei Zhang, 2015/10/26 21:58:22]

Done.

+  if (pExisting == pObj)
+    return;
+
+  if (pExisting)
+    pExisting->Release();
+
+  if (!pObj) {
+    m_Map.RemoveKey(key);
     return;
   }
-  if (p)
-    p->Release();
-  if (pObj) {
-    if (pObj->GetObjNum()) {
-      ASSERT(pObjs != NULL);
-      pObj = new CPDF_Reference(pObjs, pObj->GetObjNum());
-    }
+
+  FX_DWORD dwObjNum = pObj->GetObjNum();
+  if (dwObjNum) {
+    ASSERT(pObjs);
+    m_Map.SetAt(key, new CPDF_Reference(pObjs, dwObjNum));
+    pObj->Release();
+  } else {
     m_Map.SetAt(key, pObj);
-  } else {
-    m_Map.RemoveKey(key);
   }
 }
+
 void CPDF_Dictionary::AddValue(const CFX_ByteStringC& key, CPDF_Object* pObj) {
   ASSERT(m_Type == PDFOBJ_DICTIONARY);
   m_Map.AddValue(key, pObj);
 }
 void CPDF_Dictionary::RemoveAt(const CFX_ByteStringC& key) {
   ASSERT(m_Type == PDFOBJ_DICTIONARY);
   CPDF_Object* p = NULL;
   m_Map.Lookup(key, (void*&)p);
   if (p == NULL) {
     return;
@@ skipping 458 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;
 }