diff options
| author | thestig <thestig@chromium.org> | 2016-08-05 22:34:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-05 22:34:58 -0700 |
| commit | f41d9dc1ead47a1218e1cd37bd74ec850c8baaa3 (patch) | |
| tree | d8d32b58909814f9835898c4a87f03b5bc510e69 /core/fpdfapi/fpdf_render/fpdf_render.cpp | |
| parent | 8ca63de14d522d3d259d74fa43b28b05b02728e8 (diff) | |
| download | pdfium-f41d9dc1ead47a1218e1cd37bd74ec850c8baaa3.tar.xz | |
Add CPDF_ImageObject::GetImage().
And use it where appropriate.
Review-Url: https://codereview.chromium.org/2224623002
Diffstat (limited to 'core/fpdfapi/fpdf_render/fpdf_render.cpp')
| -rw-r--r-- | core/fpdfapi/fpdf_render/fpdf_render.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index ef208b54fd..f4e1414172 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -6,6 +6,8 @@ #include "core/fpdfapi/fpdf_render/render_int.h" +#include <memory> + #include "core/fpdfapi/fpdf_font/cpdf_type3char.h" #include "core/fpdfapi/fpdf_font/cpdf_type3font.h" #include "core/fpdfapi/fpdf_page/cpdf_colorstatedata.h" @@ -686,7 +688,7 @@ FX_BOOL CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, pGeneralState ? ToDictionary(pGeneralState->m_pSoftMask) : nullptr; if (pSMaskDict) { if (pPageObj->IsImage() && - pPageObj->AsImage()->m_pImage->GetDict()->KeyExist("SMask")) { + pPageObj->AsImage()->GetImage()->GetDict()->KeyExist("SMask")) { pSMaskDict = nullptr; } } @@ -721,11 +723,12 @@ FX_BOOL CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, pPage = m_pContext->GetPageCache()->GetPage(); pDocument = pPage->m_pDocument; } else { - pDocument = pPageObj->AsImage()->m_pImage->GetDocument(); + pDocument = pPageObj->AsImage()->GetImage()->GetDocument(); } CPDF_Dictionary* pPageResources = pPage ? pPage->m_pPageResources : nullptr; CPDF_Object* pCSObj = pPageObj->AsImage() - ->m_pImage->GetStream() + ->GetImage() + ->GetStream() ->GetDict() ->GetDirectObjectBy("ColorSpace"); CPDF_ColorSpace* pColorSpace = |