diff options
| author | thestig <thestig@chromium.org> | 2016-05-23 14:56:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-23 14:56:02 -0700 |
| commit | 490d6128e6faef423fa6f965f792513e138bc04a (patch) | |
| tree | c9e3ea73ae672b0861c92a188a9b84e808d827ea /core/fpdfapi/fpdf_render/fpdf_render.cpp | |
| parent | 109975b30dbb2b047001a840b8a1e77434fce7b3 (diff) | |
| download | pdfium-chromium/2749.tar.xz | |
Make CPDF_Function::Load() return an unique_ptr.chromium/2750chromium/2749chromium/2748
Review-Url: https://codereview.chromium.org/2000973002
Diffstat (limited to 'core/fpdfapi/fpdf_render/fpdf_render.cpp')
| -rw-r--r-- | core/fpdfapi/fpdf_render/fpdf_render.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index 4ca8a53f72..5ffedca5ab 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -342,6 +342,7 @@ void CPDF_RenderStatus::DitherObjectArea(const CPDF_PageObject* pObj, pBitmap->DitherFS(pal, 16, &rect); } } + void CPDF_RenderStatus::ProcessObjectNoClip(const CPDF_PageObject* pObj, const CFX_Matrix* pObj2Device) { FX_BOOL bRet = FALSE; @@ -356,16 +357,16 @@ void CPDF_RenderStatus::ProcessObjectNoClip(const CPDF_PageObject* pObj, bRet = ProcessImage(pObj->AsImage(), pObj2Device); break; case CPDF_PageObject::SHADING: - bRet = ProcessShading(pObj->AsShading(), pObj2Device); - break; + ProcessShading(pObj->AsShading(), pObj2Device); + return; case CPDF_PageObject::FORM: bRet = ProcessForm(pObj->AsForm(), pObj2Device); break; } - if (!bRet) { + if (!bRet) DrawObjWithBackground(pObj, pObj2Device); - } } + FX_BOOL CPDF_RenderStatus::DrawObjWithBlend(const CPDF_PageObject* pObj, const CFX_Matrix* pObj2Device) { FX_BOOL bRet = FALSE; @@ -1112,12 +1113,12 @@ CPDF_TransferFunc* CPDF_DocRenderData::GetTransferFunc(CPDF_Object* pObj) { return nullptr; for (uint32_t i = 0; i < 3; ++i) { - pFuncs[2 - i].reset(CPDF_Function::Load(pArray->GetDirectObjectAt(i))); + pFuncs[2 - i] = CPDF_Function::Load(pArray->GetDirectObjectAt(i)); if (!pFuncs[2 - i]) return nullptr; } } else { - pFuncs[0].reset(CPDF_Function::Load(pObj)); + pFuncs[0] = CPDF_Function::Load(pObj); if (!pFuncs[0]) return nullptr; } |