diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 13:19:19 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 13:19:19 -0400 |
| commit | 4816432671eef6467354aa252f22bb80acc315b7 (patch) | |
| tree | 403313130206e70abf8ceae78353042a38221bec /core/include | |
| parent | 8b8dfd7934d669b2c74a0502f82387e5df0f573b (diff) | |
| download | pdfium-4816432671eef6467354aa252f22bb80acc315b7.tar.xz | |
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/1399233003 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_objects.h | 12 | ||||
| -rw-r--r-- | core/include/fpdfdoc/fpdf_doc.h | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index c2d838d35b..4141ec854a 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -78,6 +78,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() {} @@ -402,6 +407,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, diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index b0c129b05e..770133b739 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -717,10 +717,10 @@ class CPDF_InterForm : public CFX_PrivateData { CPDF_Object* GetFieldAttr(CPDF_Dictionary* pFieldDict, const FX_CHAR* name); - CPDF_FormField* AddTerminalField(const CPDF_Dictionary* pFieldDict); + CPDF_FormField* AddTerminalField(CPDF_Dictionary* pFieldDict); CPDF_FormControl* AddControl(const CPDF_FormField* pField, - const CPDF_Dictionary* pWidgetDict); + CPDF_Dictionary* pWidgetDict); void FDF_ImportField(CPDF_Dictionary* pField, const CFX_WideString& parent_name, |