| Index: core/fpdfapi/parser/cpdf_array.h
|
| diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h
|
| index 9deb478809516500636c4a9f4dd1bd5b2164dc57..8cfa0333bb4acbbb42dde2cfa8f4d2cd72dc32e2 100644
|
| --- a/core/fpdfapi/parser/cpdf_array.h
|
| +++ b/core/fpdfapi/parser/cpdf_array.h
|
| @@ -21,7 +21,6 @@
|
| using const_iterator = std::vector<CPDF_Object*>::const_iterator;
|
|
|
| CPDF_Array();
|
| - ~CPDF_Array() override;
|
|
|
| // CPDF_Object.
|
| Type GetType() const override;
|
| @@ -62,12 +61,15 @@
|
| const_iterator end() const { return m_Objects.end(); }
|
|
|
| protected:
|
| + ~CPDF_Array() override;
|
| +
|
| CPDF_Object* CloneNonCyclic(
|
| bool bDirect,
|
| std::set<const CPDF_Object*>* pVisited) const override;
|
|
|
| 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;
|
| @@ -77,12 +79,12 @@
|
| return obj ? obj->AsArray() : nullptr;
|
| }
|
|
|
| -inline std::unique_ptr<CPDF_Array> ToArray(std::unique_ptr<CPDF_Object> obj) {
|
| +inline UniqueArray ToArray(UniqueObject obj) {
|
| CPDF_Array* pArray = ToArray(obj.get());
|
| if (!pArray)
|
| return nullptr;
|
| obj.release();
|
| - return std::unique_ptr<CPDF_Array>(pArray);
|
| + return UniqueArray(pArray);
|
| }
|
|
|
| #endif // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_
|
|
|