diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-23 17:21:01 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-24 16:41:29 +0000 |
| commit | 08f4b7762a4453818c76c680f5295986e21418ce (patch) | |
| tree | c6a771759b639180add570f4dd882d103f8efe9c /core/fpdfapi/render/cpdf_imagerenderer.cpp | |
| parent | 129b0135adf99be8e2c3015267a4689c6d62dca1 (diff) | |
| download | pdfium-08f4b7762a4453818c76c680f5295986e21418ce.tar.xz | |
Convert to CFX_UnownedPtr, part 4.
Fix strange ownership issue in cpdf_type3char.cpp, and
describe the absolutely insane stuff happening there.
Change-Id: Iae70f9eca8f125ed3ef677729f1776ba9f10183c
Reviewed-on: https://pdfium-review.googlesource.com/5830
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/render/cpdf_imagerenderer.cpp')
| -rw-r--r-- | core/fpdfapi/render/cpdf_imagerenderer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp index 70371d847b..ff4ed9c7d9 100644 --- a/core/fpdfapi/render/cpdf_imagerenderer.cpp +++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp @@ -59,10 +59,10 @@ bool CPDF_ImageRenderer::StartLoadDIBSource() { if (!image_rect.Valid()) return false; - if (m_Loader.Start(m_pImageObject, + if (m_Loader.Start(m_pImageObject.Get(), m_pRenderStatus->m_pContext->GetPageCache(), m_bStdCS, m_pRenderStatus->m_GroupFamily, - m_pRenderStatus->m_bLoadMask, m_pRenderStatus)) { + m_pRenderStatus->m_bLoadMask, m_pRenderStatus.Get())) { m_Status = 4; return true; } @@ -102,7 +102,7 @@ bool CPDF_ImageRenderer::StartRenderDIBSource() { if (m_pPattern) m_bPatternColor = true; } - m_FillArgb = m_pRenderStatus->GetFillArgb(m_pImageObject); + m_FillArgb = m_pRenderStatus->GetFillArgb(m_pImageObject.Get()); } else if (m_pRenderStatus->m_Options.m_ColorMode == RENDER_COLOR_GRAY) { m_pClone = m_pDIBSource->Clone(nullptr); m_pClone->ConvertColorScale(m_pRenderStatus->m_Options.m_BackColor, @@ -127,7 +127,7 @@ bool CPDF_ImageRenderer::StartRenderDIBSource() { return DrawMaskedImage(); if (m_bPatternColor) - return DrawPatternImage(m_pObj2Device); + return DrawPatternImage(m_pObj2Device.Get()); if (m_BitmapAlpha != 255 || !state.HasRef() || !state.GetFillOP() || state.GetOPMode() != 0 || state.GetBlendType() != FXDIB_BLEND_NORMAL || @@ -284,11 +284,11 @@ bool CPDF_ImageRenderer::DrawPatternImage(const CFX_Matrix* pObj2Device) { patternDevice.Translate(static_cast<float>(-rect.left), static_cast<float>(-rect.top)); if (CPDF_TilingPattern* pTilingPattern = m_pPattern->AsTilingPattern()) { - bitmap_render.DrawTilingPattern(pTilingPattern, m_pImageObject, + bitmap_render.DrawTilingPattern(pTilingPattern, m_pImageObject.Get(), &patternDevice, false); } else if (CPDF_ShadingPattern* pShadingPattern = m_pPattern->AsShadingPattern()) { - bitmap_render.DrawShadingPattern(pShadingPattern, m_pImageObject, + bitmap_render.DrawShadingPattern(pShadingPattern, m_pImageObject.Get(), &patternDevice, false); } @@ -539,7 +539,7 @@ bool CPDF_ImageRenderer::Continue(IFX_Pause* pPause) { pPause); if (m_Status == 4) { - if (m_Loader.Continue(pPause, m_pRenderStatus)) + if (m_Loader.Continue(pPause, m_pRenderStatus.Get())) return true; if (StartRenderDIBSource()) |