diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 14:57:56 -0400 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-10-20 14:57:56 -0400 |
| commit | 39869b641511c882d78e17548293cdb458c36f38 (patch) | |
| tree | 6e7fee229f9c8a5d628c2dfe81b3e9848a9670d2 /core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp | |
| parent | 19169dae5bf92813b7419793f61dfca8b4fb9124 (diff) | |
| download | pdfium-39869b641511c882d78e17548293cdb458c36f38.tar.xz | |
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 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp index e9f70c14db..9cdf00e717 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp @@ -52,8 +52,7 @@ CPDF_Image* CPDF_Image::Clone() { pImage->LoadImageF((CPDF_Stream*)((CPDF_Object*)m_pStream)->Clone(), m_bInline); if (m_bInline) { - CPDF_Dictionary* pInlineDict = (CPDF_Dictionary*)m_pInlineDict->Clone(TRUE); - pImage->SetInlineDict(pInlineDict); + pImage->SetInlineDict(ToDictionary(m_pInlineDict->Clone(TRUE))); } return pImage; } @@ -86,7 +85,7 @@ FX_BOOL CPDF_Image::LoadImageF(CPDF_Stream* pStream, FX_BOOL bInline) { m_bInline = bInline; CPDF_Dictionary* pDict = pStream->GetDict(); if (m_bInline) { - m_pInlineDict = (CPDF_Dictionary*)pDict->Clone(); + m_pInlineDict = ToDictionary(pDict->Clone()); } m_pOC = pDict->GetDict(FX_BSTRC("OC")); m_bIsMask = !pDict->KeyExist(FX_BSTRC("ColorSpace")) || |