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 /fpdfsdk/src/fpdfeditpage.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 'fpdfsdk/src/fpdfeditpage.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdfeditpage.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index f2d13d6ba1..7b70526b0c 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -103,7 +103,7 @@ DLLEXPORT int STDCALL FPDFPage_GetRotation(FPDF_PAGE page) { else { if (pDict->KeyExist("Parent")) { CPDF_Dictionary* pPages = - (CPDF_Dictionary*)pDict->GetElement("Parent")->GetDirect(); + ToDictionary(pDict->GetElement("Parent")->GetDirect()); while (pPages) { if (pPages->KeyExist("Rotate")) { rotate = @@ -113,8 +113,7 @@ DLLEXPORT int STDCALL FPDFPage_GetRotation(FPDF_PAGE page) { : 0; break; } else if (pPages->KeyExist("Parent")) - pPages = - (CPDF_Dictionary*)pPages->GetElement("Parent")->GetDirect(); + pPages = ToDictionary(pPages->GetElement("Parent")->GetDirect()); else break; } @@ -213,7 +212,7 @@ FPDFPageObj_HasTransparency(FPDF_PAGEOBJECT pageObject) { return TRUE; CPDF_Dictionary* pSMaskDict = - pGeneralState ? (CPDF_Dictionary*)pGeneralState->m_pSoftMask : NULL; + pGeneralState ? ToDictionary(pGeneralState->m_pSoftMask) : NULL; if (pSMaskDict) return TRUE; |