diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-01-22 12:06:32 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-01-22 12:06:32 -0800 |
| commit | 71fdc34b71760735aa0c14c820a1a10eb1e5829a (patch) | |
| tree | 03424565134e2dd7adb29a23a15324600b764b57 /core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp | |
| parent | 8139bc147f6936d490d2e47632213ec13251e925 (diff) | |
| download | pdfium-71fdc34b71760735aa0c14c820a1a10eb1e5829a.tar.xz | |
Merge to XFA: Change _PDF_RenderItem to CPDF_RenderContext::Layer.
Original Review URL: https://codereview.chromium.org/1620523002 .
(cherry picked from commit d5712ac571f3487fe3f74617fdab007a11a09052)
TBR=ochang@chromium.org
Review URL: https://codereview.chromium.org/1624553004 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp index 3f7347b8f1..a0b3059e5b 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -883,7 +883,8 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict, CFX_Matrix matrix = *pMatrix; matrix.TranslateI(-pClipRect->left, -pClipRect->top); - CPDF_Form form(m_pContext->m_pDocument, m_pContext->m_pPageResources, pGroup); + CPDF_Form form(m_pContext->GetDocument(), m_pContext->GetPageResources(), + pGroup); form.ParseContent(NULL, NULL, NULL, NULL); CFX_FxgeDevice bitmap_device; #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ @@ -909,7 +910,7 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict, pCSObj = pDict->GetDict("Group")->GetElementValue("CS"); else pCSObj = NULL; - pCS = m_pContext->m_pDocument->LoadColorSpace(pCSObj); + pCS = m_pContext->GetDocument()->LoadColorSpace(pCSObj); if (pCS) { FX_FLOAT R, G, B; FX_DWORD comps = 8; @@ -931,7 +932,7 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict, pCS->GetRGB(pFloats, R, G, B); back_color = 0xff000000 | ((int32_t)(R * 255) << 16) | ((int32_t)(G * 255) << 8) | (int32_t)(B * 255); - m_pContext->m_pDocument->GetPageData()->ReleaseColorSpace(pCSObj); + m_pContext->GetDocument()->GetPageData()->ReleaseColorSpace(pCSObj); } } bitmap.Clear(back_color); |