diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-13 15:56:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-13 15:56:53 -0700 |
| commit | 4e4d1a662b09d9ee1dc93dd8ee37694d3c4eb519 (patch) | |
| tree | ef6c2b6e8915ac1463d7fb50f8275e3422d41506 /core/fpdfapi/parser/cpdf_dictionary.h | |
| parent | 36bad2b022014ea7161fe888fec1191d2ba6b894 (diff) | |
| download | pdfium-4e4d1a662b09d9ee1dc93dd8ee37694d3c4eb519.tar.xz | |
Make CPDF_Image() constructors saner.chromium/2890
Introduce the UniqueDictionary typedef and friends, to allow
moving to unique_ptrs before the Release() deleter issue is
fully resolved. This will go away down the road.
Review-Url: https://codereview.chromium.org/2420743002
Diffstat (limited to 'core/fpdfapi/parser/cpdf_dictionary.h')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_dictionary.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/fpdfapi/parser/cpdf_dictionary.h b/core/fpdfapi/parser/cpdf_dictionary.h index 9cf575ddd4..fb8200f78c 100644 --- a/core/fpdfapi/parser/cpdf_dictionary.h +++ b/core/fpdfapi/parser/cpdf_dictionary.h @@ -15,6 +15,7 @@ #include "core/fxcrt/cfx_weak_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" +#include "third_party/base/ptr_util.h" class CPDF_IndirectObjectHolder; @@ -98,6 +99,9 @@ class CPDF_Dictionary : public CPDF_Object { std::map<CFX_ByteString, CPDF_Object*> m_Map; }; +using UniqueDictionary = + std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Object>>; + inline CPDF_Dictionary* ToDictionary(CPDF_Object* obj) { return obj ? obj->AsDictionary() : nullptr; } @@ -106,4 +110,12 @@ inline const CPDF_Dictionary* ToDictionary(const CPDF_Object* obj) { return obj ? obj->AsDictionary() : nullptr; } +inline UniqueDictionary ToDictionary(UniqueObject obj) { + CPDF_Dictionary* pDict = ToDictionary(obj.get()); + if (!pDict) + return nullptr; + obj.release(); + return UniqueDictionary(pDict); +} + #endif // CORE_FPDFAPI_PARSER_CPDF_DICTIONARY_H_ |