From 43f382c23c24a7b8214f4ea461623f13e25ca02a Mon Sep 17 00:00:00 2001 From: npm Date: Wed, 23 Nov 2016 07:35:23 -0800 Subject: Move CPDF_ImageRenderer from render_int Review-Url: https://codereview.chromium.org/2525833002 --- core/fpdfapi/render/cpdf_renderstatus.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/fpdfapi/render/cpdf_renderstatus.cpp') diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index aad9af04e3..7e0d30f286 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -34,6 +34,7 @@ #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fpdfapi/render/cpdf_charposlist.h" #include "core/fpdfapi/render/cpdf_docrenderdata.h" +#include "core/fpdfapi/render/cpdf_imagerenderer.h" #include "core/fpdfapi/render/cpdf_pagerendercache.h" #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" @@ -1075,7 +1076,8 @@ bool CPDF_RenderStatus::ContinueSingleObject(CPDF_PageObject* pObj, if (pObj->IsImage()) { m_pImageRenderer.reset(new CPDF_ImageRenderer); - if (!m_pImageRenderer->Start(this, pObj, pObj2Device, false)) { + if (!m_pImageRenderer->Start(this, pObj, pObj2Device, false, + FXDIB_BLEND_NORMAL)) { if (!m_pImageRenderer->m_Result) DrawObjWithBackground(pObj, pObj2Device); m_pImageRenderer.reset(); @@ -1894,7 +1896,7 @@ bool CPDF_RenderStatus::ProcessType3Text(CPDF_TextObject* textobj, image_matrix.Concat(matrix); CPDF_ImageRenderer renderer; if (renderer.Start(this, pType3Char->m_pBitmap.get(), fill_argb, 255, - &image_matrix, 0, false)) { + &image_matrix, 0, false, FXDIB_BLEND_NORMAL)) { renderer.Continue(nullptr); } if (!renderer.m_Result) -- cgit v1.2.3