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_stream.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_stream.h')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_stream.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/fpdfapi/parser/cpdf_stream.h b/core/fpdfapi/parser/cpdf_stream.h index 575a9ebe0b..756eccfba1 100644 --- a/core/fpdfapi/parser/cpdf_stream.h +++ b/core/fpdfapi/parser/cpdf_stream.h @@ -58,7 +58,7 @@ class CPDF_Stream : public CPDF_Object { IFX_FileRead* m_pFile = nullptr; }; -using UniqueStream = std::unique_ptr<CPDF_Stream, ReleaseDeleter<CPDF_Stream>>; +using UniqueStream = std::unique_ptr<CPDF_Stream, ReleaseDeleter<CPDF_Object>>; inline CPDF_Stream* ToStream(CPDF_Object* obj) { return obj ? obj->AsStream() : nullptr; @@ -68,4 +68,12 @@ inline const CPDF_Stream* ToStream(const CPDF_Object* obj) { return obj ? obj->AsStream() : nullptr; } +inline UniqueStream ToStream(UniqueObject obj) { + CPDF_Stream* pStream = ToStream(obj.get()); + if (!pStream) + return nullptr; + obj.release(); + return UniqueStream(pStream); +} + #endif // CORE_FPDFAPI_PARSER_CPDF_STREAM_H_ |