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_array.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_array.h')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_array.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h index 46e9d47667..8cfa0333bb 100644 --- a/core/fpdfapi/parser/cpdf_array.h +++ b/core/fpdfapi/parser/cpdf_array.h @@ -69,6 +69,7 @@ class CPDF_Array : public CPDF_Object { std::vector<CPDF_Object*> m_Objects; }; +using UniqueArray = std::unique_ptr<CPDF_Array, ReleaseDeleter<CPDF_Object>>; inline CPDF_Array* ToArray(CPDF_Object* obj) { return obj ? obj->AsArray() : nullptr; @@ -78,4 +79,12 @@ inline const CPDF_Array* ToArray(const CPDF_Object* obj) { return obj ? obj->AsArray() : nullptr; } +inline UniqueArray ToArray(UniqueObject obj) { + CPDF_Array* pArray = ToArray(obj.get()); + if (!pArray) + return nullptr; + obj.release(); + return UniqueArray(pArray); +} + #endif // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_ |