diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 13:30:34 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 13:30:34 -0400 |
| commit | 937840e1722d1f2b77d80575d6e710d760662c9c (patch) | |
| tree | ff065615d6d91abe8e5c788da3a08386fc2d25d6 /core/include | |
| parent | c29bee029cd5fe3f8a4ceb580235ac2d0e5ce8fd (diff) | |
| download | pdfium-937840e1722d1f2b77d80575d6e710d760662c9c.tar.xz | |
Revert "Add type cast definitions for CPDF_Dictionary."
This reverts commit 4816432671eef6467354aa252f22bb80acc315b7.
Reason, broke the javascript_test Rendering PDF file
/mnt/data/b/build/slave/linux/build/pdfium/out/Debug/gen/pdfium/testing/javascript/document_methods.pdf.
Non-linearized path...
FAILURE: document_methods.in; Command
'['/mnt/data/b/build/slave/linux/build/pdfium/out/Debug/pdfium_test',
'/mnt/data/b/build/slave/linux/build/pdfium/out/Debug/gen/pdfium/testing/javascript/document_methods.pdf']'
returned non-zero exit status -11
BUG=pdfium:201
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1412413002 .
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, 2 insertions, 14 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index 4141ec854a..c2d838d35b 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -78,11 +78,6 @@ 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() {} @@ -407,13 +402,6 @@ 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 770133b739..b0c129b05e 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(CPDF_Dictionary* pFieldDict); + CPDF_FormField* AddTerminalField(const CPDF_Dictionary* pFieldDict); CPDF_FormControl* AddControl(const CPDF_FormField* pField, - CPDF_Dictionary* pWidgetDict); + const CPDF_Dictionary* pWidgetDict); void FDF_ImportField(CPDF_Dictionary* pField, const CFX_WideString& parent_name, |