From b05836511dfab9483438fc8dcbab2f4ae6dcc1b1 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 5 Mar 2018 14:46:57 +0000 Subject: Change return types for some rendering Start/Continue methods. Either return a bool or a CPDF_DIBSource::LoadState. Explain what the bool return value means. Change-Id: I6346d0cd61d5faee5290df181cfff3b9e4d5d84e Reviewed-on: https://pdfium-review.googlesource.com/27851 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fpdfapi/render/cpdf_pagerendercache.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'core/fpdfapi/render/cpdf_pagerendercache.cpp') diff --git a/core/fpdfapi/render/cpdf_pagerendercache.cpp b/core/fpdfapi/render/cpdf_pagerendercache.cpp index 0d01589af3..781f18f0e0 100644 --- a/core/fpdfapi/render/cpdf_pagerendercache.cpp +++ b/core/fpdfapi/render/cpdf_pagerendercache.cpp @@ -94,17 +94,17 @@ bool CPDF_PageRenderCache::StartGetCachedBitmap( m_pCurImageCacheEntry = new CPDF_ImageCacheEntry(m_pPage->m_pDocument.Get(), pImage); } - int ret = m_pCurImageCacheEntry->StartGetCachedBitmap( + CPDF_DIBSource::LoadState ret = m_pCurImageCacheEntry->StartGetCachedBitmap( pRenderStatus->GetFormResource(), m_pPage->m_pPageResources.Get(), bStdCS, GroupFamily, bLoadMask, pRenderStatus); - if (ret == 2) + if (ret == CPDF_DIBSource::LoadState::kContinue) return true; m_nTimeCount++; if (!m_bCurFindCache) m_ImageCache[pStream] = m_pCurImageCacheEntry; - if (!ret) + if (ret == CPDF_DIBSource::LoadState::kFail) m_nCacheSize += m_pCurImageCacheEntry->EstimateSize(); return false; @@ -112,8 +112,8 @@ bool CPDF_PageRenderCache::StartGetCachedBitmap( bool CPDF_PageRenderCache::Continue(IFX_PauseIndicator* pPause, CPDF_RenderStatus* pRenderStatus) { - int ret = m_pCurImageCacheEntry->Continue(pPause, pRenderStatus); - if (ret == 2) + bool ret = m_pCurImageCacheEntry->Continue(pPause, pRenderStatus); + if (ret) return true; m_nTimeCount++; @@ -121,8 +121,7 @@ bool CPDF_PageRenderCache::Continue(IFX_PauseIndicator* pPause, m_ImageCache[m_pCurImageCacheEntry->GetImage()->GetStream()] = m_pCurImageCacheEntry; } - if (!ret) - m_nCacheSize += m_pCurImageCacheEntry->EstimateSize(); + m_nCacheSize += m_pCurImageCacheEntry->EstimateSize(); return false; } -- cgit v1.2.3