diff options
author | npm <npm@chromium.org> | 2016-11-21 07:28:42 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-11-21 07:28:43 -0800 |
commit | ca5300a2cb1332dbdcf877653658910ccdad5326 (patch) | |
tree | 0cbffc8e05edb58171951a984e1b029b7f9aff38 /core/fpdfapi/render/fpdf_render_image.cpp | |
parent | 88cb0a32586cae4d00654c679dbb41fa0133c3e5 (diff) | |
download | pdfium-ca5300a2cb1332dbdcf877653658910ccdad5326.tar.xz |
Continue splitting up render_int
Moved CPDF_ImageLoader, CPDF_ImageLoaderHandle, and CPDF_TransferFunc
Review-Url: https://codereview.chromium.org/2518553002
Diffstat (limited to 'core/fpdfapi/render/fpdf_render_image.cpp')
-rw-r--r-- | core/fpdfapi/render/fpdf_render_image.cpp | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/core/fpdfapi/render/fpdf_render_image.cpp b/core/fpdfapi/render/fpdf_render_image.cpp index 0c89a7521c..cf5f97bab8 100644 --- a/core/fpdfapi/render/fpdf_render_image.cpp +++ b/core/fpdfapi/render/fpdf_render_image.cpp @@ -25,6 +25,7 @@ #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" #include "core/fpdfapi/render/cpdf_renderstatus.h" +#include "core/fpdfapi/render/cpdf_transferfunc.h" #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_safe_types.h" @@ -35,21 +36,6 @@ #include "core/fxge/skia/fx_skia_device.h" #endif -CPDF_TransferFunc::CPDF_TransferFunc(CPDF_Document* pDoc) : m_pPDFDoc(pDoc) {} - -FX_COLORREF CPDF_TransferFunc::TranslateColor(FX_COLORREF rgb) const { - return FXSYS_RGB(m_Samples[FXSYS_GetRValue(rgb)], - m_Samples[256 + FXSYS_GetGValue(rgb)], - m_Samples[512 + FXSYS_GetBValue(rgb)]); -} - -CFX_DIBSource* CPDF_TransferFunc::TranslateImage(const CFX_DIBSource* pSrc, - bool bAutoDropSrc) { - CPDF_DIBTransferFunc* pDest = new CPDF_DIBTransferFunc(this); - pDest->LoadSrc(pSrc, bAutoDropSrc); - return pDest; -} - CPDF_DIBTransferFunc::~CPDF_DIBTransferFunc() {} FXDIB_Format CPDF_DIBTransferFunc::GetDestFormat() { @@ -251,15 +237,12 @@ bool CPDF_ImageRenderer::StartLoadDIBSource() { if (m_ImageMatrix.d > 0) { dest_height = -dest_height; } - if (m_Loader.Start(m_pImageObject, - m_pRenderStatus->m_pContext->GetPageCache(), &m_LoadHandle, - m_bStdCS, m_pRenderStatus->m_GroupFamily, - m_pRenderStatus->m_bLoadMask, m_pRenderStatus, dest_width, - dest_height)) { - if (m_LoadHandle) { - m_Status = 4; - return true; - } + if (m_Loader.Start( + m_pImageObject, m_pRenderStatus->m_pContext->GetPageCache(), m_bStdCS, + m_pRenderStatus->m_GroupFamily, m_pRenderStatus->m_bLoadMask, + m_pRenderStatus, dest_width, dest_height)) { + m_Status = 4; + return true; } return false; } @@ -810,7 +793,7 @@ bool CPDF_ImageRenderer::Continue(IFX_Pause* pPause) { return m_pRenderStatus->m_pDevice->ContinueDIBits(m_DeviceHandle, pPause); if (m_Status == 4) { - if (m_Loader.Continue(m_LoadHandle.get(), pPause)) + if (m_Loader.Continue(pPause)) return true; if (StartRenderDIBSource()) |