| OLD | NEW |
| 1 // Copyright 2016 PDFium Authors. All rights reserved. | 1 // Copyright 2016 PDFium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com |
| 6 | 6 |
| 7 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" | 7 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 | 24 |
| 25 CPDF_Dictionary::CPDF_Dictionary(const CFX_WeakPtr<CFX_ByteStringPool>& pPool) | 25 CPDF_Dictionary::CPDF_Dictionary(const CFX_WeakPtr<CFX_ByteStringPool>& pPool) |
| 26 : m_pPool(pPool) {} | 26 : m_pPool(pPool) {} |
| 27 | 27 |
| 28 CPDF_Dictionary::~CPDF_Dictionary() { | 28 CPDF_Dictionary::~CPDF_Dictionary() { |
| 29 // Mark the object as deleted so that it will not be deleted again | 29 // Mark the object as deleted so that it will not be deleted again |
| 30 // in case of cyclic references. | 30 // in case of cyclic references. |
| 31 m_ObjNum = kInvalidObjNum; | 31 m_ObjNum = kInvalidObjNum; |
| 32 for (const auto& it : m_Map) { | 32 for (const auto& it : m_Map) { |
| 33 if (it.second && it.second->GetObjNum() != kInvalidObjNum) | 33 if (it.second && it.second->GetObjNum() != kInvalidObjNum) |
| 34 it.second->Release(); | 34 delete it.second; |
| 35 } | 35 } |
| 36 } | 36 } |
| 37 | 37 |
| 38 CPDF_Object::Type CPDF_Dictionary::GetType() const { | 38 CPDF_Object::Type CPDF_Dictionary::GetType() const { |
| 39 return DICTIONARY; | 39 return DICTIONARY; |
| 40 } | 40 } |
| 41 | 41 |
| 42 CPDF_Dictionary* CPDF_Dictionary::GetDict() const { | 42 CPDF_Dictionary* CPDF_Dictionary::GetDict() const { |
| 43 // The method should be made non-const if we want to not be const. | 43 // The method should be made non-const if we want to not be const. |
| 44 // See bug #234. | 44 // See bug #234. |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 CHECK(!pObj || pObj->GetObjNum() == 0); | 177 CHECK(!pObj || pObj->GetObjNum() == 0); |
| 178 auto it = m_Map.find(key); | 178 auto it = m_Map.find(key); |
| 179 if (it == m_Map.end()) { | 179 if (it == m_Map.end()) { |
| 180 if (pObj) | 180 if (pObj) |
| 181 m_Map.insert(std::make_pair(MaybeIntern(key), pObj)); | 181 m_Map.insert(std::make_pair(MaybeIntern(key), pObj)); |
| 182 return; | 182 return; |
| 183 } | 183 } |
| 184 | 184 |
| 185 if (it->second == pObj) | 185 if (it->second == pObj) |
| 186 return; | 186 return; |
| 187 it->second->Release(); | 187 delete it->second; |
| 188 | 188 |
| 189 if (pObj) | 189 if (pObj) |
| 190 it->second = pObj; | 190 it->second = pObj; |
| 191 else | 191 else |
| 192 m_Map.erase(it); | 192 m_Map.erase(it); |
| 193 } | 193 } |
| 194 | 194 |
| 195 void CPDF_Dictionary::RemoveFor(const CFX_ByteString& key) { | 195 void CPDF_Dictionary::RemoveFor(const CFX_ByteString& key) { |
| 196 auto it = m_Map.find(key); | 196 auto it = m_Map.find(key); |
| 197 if (it == m_Map.end()) | 197 if (it == m_Map.end()) |
| 198 return; | 198 return; |
| 199 | 199 |
| 200 it->second->Release(); | 200 delete it->second; |
| 201 m_Map.erase(it); | 201 m_Map.erase(it); |
| 202 } | 202 } |
| 203 | 203 |
| 204 void CPDF_Dictionary::ReplaceKey(const CFX_ByteString& oldkey, | 204 void CPDF_Dictionary::ReplaceKey(const CFX_ByteString& oldkey, |
| 205 const CFX_ByteString& newkey) { | 205 const CFX_ByteString& newkey) { |
| 206 auto old_it = m_Map.find(oldkey); | 206 auto old_it = m_Map.find(oldkey); |
| 207 if (old_it == m_Map.end()) | 207 if (old_it == m_Map.end()) |
| 208 return; | 208 return; |
| 209 | 209 |
| 210 auto new_it = m_Map.find(newkey); | 210 auto new_it = m_Map.find(newkey); |
| 211 if (new_it == old_it) | 211 if (new_it == old_it) |
| 212 return; | 212 return; |
| 213 | 213 |
| 214 if (new_it != m_Map.end()) { | 214 if (new_it != m_Map.end()) { |
| 215 new_it->second->Release(); | 215 delete new_it->second; |
| 216 new_it->second = old_it->second; | 216 new_it->second = old_it->second; |
| 217 } else { | 217 } else { |
| 218 m_Map.insert(std::make_pair(MaybeIntern(newkey), old_it->second)); | 218 m_Map.insert(std::make_pair(MaybeIntern(newkey), old_it->second)); |
| 219 } | 219 } |
| 220 m_Map.erase(old_it); | 220 m_Map.erase(old_it); |
| 221 } | 221 } |
| 222 | 222 |
| 223 void CPDF_Dictionary::SetIntegerFor(const CFX_ByteString& key, int i) { | 223 void CPDF_Dictionary::SetIntegerFor(const CFX_ByteString& key, int i) { |
| 224 SetFor(key, new CPDF_Number(i)); | 224 SetFor(key, new CPDF_Number(i)); |
| 225 } | 225 } |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 pArray->AddNumber(matrix.c); | 266 pArray->AddNumber(matrix.c); |
| 267 pArray->AddNumber(matrix.d); | 267 pArray->AddNumber(matrix.d); |
| 268 pArray->AddNumber(matrix.e); | 268 pArray->AddNumber(matrix.e); |
| 269 pArray->AddNumber(matrix.f); | 269 pArray->AddNumber(matrix.f); |
| 270 SetFor(key, pArray); | 270 SetFor(key, pArray); |
| 271 } | 271 } |
| 272 | 272 |
| 273 CFX_ByteString CPDF_Dictionary::MaybeIntern(const CFX_ByteString& str) { | 273 CFX_ByteString CPDF_Dictionary::MaybeIntern(const CFX_ByteString& str) { |
| 274 return m_pPool ? m_pPool->Intern(str) : str; | 274 return m_pPool ? m_pPool->Intern(str) : str; |
| 275 } | 275 } |
| OLD | NEW |