From 937840e1722d1f2b77d80575d6e710d760662c9c Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 20 Oct 2015 13:30:34 -0400 Subject: 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 . --- core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'core/src/fpdfapi/fpdf_edit') diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp index 054cf10c22..4e6c72355d 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp @@ -110,7 +110,7 @@ int32_t PDF_CreatorAppendObject(const CPDF_Object* pObj, return -1; } offset += 2; - const CPDF_Dictionary* p = pObj->AsDictionary(); + CPDF_Dictionary* p = (CPDF_Dictionary*)pObj; FX_POSITION pos = p->GetStartPos(); while (pos) { CFX_ByteString key; @@ -334,8 +334,7 @@ CPDF_FlateEncoder::CPDF_FlateEncoder() { } void CPDF_FlateEncoder::CloneDict() { if (!m_bCloned) { - m_pDict = ToDictionary(m_pDict->Clone()); - ASSERT(m_pDict); + m_pDict = (CPDF_Dictionary*)m_pDict->Clone(); m_bCloned = TRUE; } } @@ -350,7 +349,7 @@ FX_BOOL CPDF_FlateEncoder::Initialize(CPDF_Stream* pStream, destAcc.LoadAllData(pStream); m_dwSize = destAcc.GetSize(); m_pData = (uint8_t*)destAcc.DetachData(); - m_pDict = ToDictionary(pStream->GetDict()->Clone()); + m_pDict = (CPDF_Dictionary*)pStream->GetDict()->Clone(); m_pDict->RemoveAt(FX_BSTRC("Filter")); m_bNewData = TRUE; m_bCloned = TRUE; @@ -366,7 +365,7 @@ FX_BOOL CPDF_FlateEncoder::Initialize(CPDF_Stream* pStream, m_bNewData = TRUE; m_bCloned = TRUE; ::FlateEncode(m_Acc.GetData(), m_Acc.GetSize(), m_pData, m_dwSize); - m_pDict = ToDictionary(pStream->GetDict()->Clone()); + m_pDict = (CPDF_Dictionary*)pStream->GetDict()->Clone(); m_pDict->SetAtInteger("Length", m_dwSize); m_pDict->SetAtName("Filter", "FlateDecode"); m_pDict->RemoveAt("DecodeParms"); @@ -1228,7 +1227,7 @@ int32_t CPDF_Creator::WriteDirectObj(FX_DWORD objnum, return -1; } m_Offset += 2; - const CPDF_Dictionary* p = pObj->AsDictionary(); + CPDF_Dictionary* p = (CPDF_Dictionary*)pObj; FX_BOOL bSignDict = IsSignatureDict(p); FX_POSITION pos = p->GetStartPos(); while (pos) { -- cgit v1.2.3