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/src/fpdfapi/fpdf_render/fpdf_render.cpp | |
| 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/src/fpdfapi/fpdf_render/fpdf_render.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp index 9db35068f9..99835a3b94 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp @@ -738,7 +738,7 @@ FX_BOOL CPDF_RenderStatus::ProcessTransparency( return TRUE; } CPDF_Dictionary* pSMaskDict = - pGeneralState ? (CPDF_Dictionary*)pGeneralState->m_pSoftMask : NULL; + pGeneralState ? ToDictionary(pGeneralState->m_pSoftMask) : NULL; if (pSMaskDict) { if (pPageObj->m_Type == PDFPAGE_IMAGE && ((CPDF_ImageObject*)pPageObj) @@ -1438,7 +1438,8 @@ FX_BOOL IPDF_OCContext::CheckObjectVisible(const CPDF_PageObject* pObj) { CPDF_ContentMarkItem& item = pData->GetItem(i); if (item.GetName() == FX_BSTRC("OC") && item.GetParamType() == CPDF_ContentMarkItem::PropertiesDict) { - CPDF_Dictionary* pOCG = (CPDF_Dictionary*)item.GetParam(); + CPDF_Dictionary* pOCG = + ToDictionary(static_cast<CPDF_Object*>(item.GetParam())); if (!CheckOCGVisible(pOCG)) { return FALSE; } |