diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 16:24:45 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 16:24:45 -0400 |
| commit | f1251c1ff2b3452854681d0648b4c1ca4180ff0d (patch) | |
| tree | dbcff41b8f8a5ea3d1d5280ff0c946b9647c301a /core/include/fpdfapi/fpdf_objects.h | |
| parent | 49f88b708d905b052bc00769ac7cb48202cac019 (diff) | |
| download | pdfium-f1251c1ff2b3452854681d0648b4c1ca4180ff0d.tar.xz | |
[Merge to XFA] Revert "Revert "Add type cast definitions for CPDF_Dictionary.""
This reverts commit 937840e1722d1f2b77d80575d6e710d760662c9c.
Add type cast definitions for CPDF_Dictionary.
This CL adds ToCPDFDictionary type definitions and updates one file to use
instead of straight casts. I had to fix two places where we'd casted off the
constness of the original pointer.
BUG=pdfium:201
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1420583003 .
(cherry picked from commit 39869b641511c882d78e17548293cdb458c36f38)
Review URL: https://codereview.chromium.org/1410343003 .
Diffstat (limited to 'core/include/fpdfapi/fpdf_objects.h')
| -rw-r--r-- | core/include/fpdfapi/fpdf_objects.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index 58fb37c226..d64a0924f8 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -80,6 +80,11 @@ class CPDF_Object { FX_BOOL IsModified() const { return FALSE; } + bool IsDictionary() const { return m_Type == PDFOBJ_DICTIONARY; } + + CPDF_Dictionary* AsDictionary(); + const CPDF_Dictionary* AsDictionary() const; + protected: CPDF_Object(FX_DWORD type) : m_Type(type), m_ObjNum(0), m_GenNum(0) {} ~CPDF_Object() {} @@ -404,6 +409,13 @@ class CPDF_Dictionary : public CPDF_Object { friend class CPDF_Object; }; +inline CPDF_Dictionary* ToDictionary(CPDF_Object* obj) { + return obj ? obj->AsDictionary() : nullptr; +} +inline const CPDF_Dictionary* ToDictionary(const CPDF_Object* obj) { + return obj ? obj->AsDictionary() : nullptr; +} + class CPDF_Stream : public CPDF_Object { public: static CPDF_Stream* Create(uint8_t* pData, |