summaryrefslogtreecommitdiff
path: root/core/fpdfapi/page/cpdf_image.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-03-05 14:46:57 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-03-05 14:46:57 +0000
commitb05836511dfab9483438fc8dcbab2f4ae6dcc1b1 (patch)
tree3b66bc8e99f995e4b1faf9a01d7a32833dd6a0cd /core/fpdfapi/page/cpdf_image.cpp
parente9b55327048158958d75ab3577a002084d3aed1b (diff)
downloadpdfium-b05836511dfab9483438fc8dcbab2f4ae6dcc1b1.tar.xz
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 <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_image.cpp')
-rw-r--r--core/fpdfapi/page/cpdf_image.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp
index 5f82886a9b..24f58dfeff 100644
--- a/core/fpdfapi/page/cpdf_image.cpp
+++ b/core/fpdfapi/page/cpdf_image.cpp
@@ -351,7 +351,7 @@ bool CPDF_Image::StartLoadDIBSource(CPDF_Dictionary* pFormResource,
int ret = source->StartLoadDIBSource(m_pDocument.Get(), m_pStream.Get(), true,
pFormResource, pPageResource, bStdCS,
GroupFamily, bLoadMask);
- if (!ret) {
+ if (ret == 0) {
m_pDIBSource.Reset();
return false;
}
@@ -367,14 +367,14 @@ bool CPDF_Image::StartLoadDIBSource(CPDF_Dictionary* pFormResource,
bool CPDF_Image::Continue(IFX_PauseIndicator* pPause) {
RetainPtr<CPDF_DIBSource> pSource = m_pDIBSource.As<CPDF_DIBSource>();
int ret = pSource->ContinueLoadDIBSource(pPause);
- if (!ret) {
- m_pDIBSource.Reset();
- return false;
- }
if (ret == 2)
return true;
- m_pMask = pSource->DetachMask();
- m_MatteColor = pSource->GetMatteColor();
+ if (ret == 1) {
+ m_pMask = pSource->DetachMask();
+ m_MatteColor = pSource->GetMatteColor();
+ } else {
+ m_pDIBSource.Reset();
+ }
return false;
}