From df663f5fcfc860249ab318407353f0aca907522d Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 18 Dec 2015 15:36:55 -0800 Subject: Merge to XFA: CPDF_ImageLoader::Load() unused. Original Review URL: https://codereview.chromium.org/1535243002 . (cherry picked from commit b5385ba5d0c616cd4af994b2a9d674588086f75c) TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1539003002 . --- core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp') diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp index a9544d3c1b..ea6195dc8e 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -311,7 +311,7 @@ CPDF_ImageRenderer::~CPDF_ImageRenderer() { if (m_DeviceHandle) { m_pRenderStatus->m_pDevice->CancelDIBits(m_DeviceHandle); } - delete (CPDF_ProgressiveImageLoaderHandle*)m_LoadHandle; + delete m_LoadHandle; delete m_pClone; } FX_BOOL CPDF_ImageRenderer::StartLoadDIBSource() { @@ -325,16 +325,15 @@ FX_BOOL CPDF_ImageRenderer::StartLoadDIBSource() { if (m_ImageMatrix.d > 0) { dest_height = -dest_height; } - if (m_Loader.StartLoadImage( - 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_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; } - return FALSE; } return FALSE; } -- cgit v1.2.3