diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-14 21:06:48 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-14 21:06:48 +0000 |
| commit | aae14df8c1a0a36f772afb4ba5b3537f4ea0b214 (patch) | |
| tree | d5497026682bf46469e2ec9256436b62e6780226 | |
| parent | b924003d35048babcf86d6b8cc0aef9e3ad33173 (diff) | |
| download | pdfium-aae14df8c1a0a36f772afb4ba5b3537f4ea0b214.tar.xz | |
Remove default args from CPDF_DIBSource::StartLoadDIBSource().
Change-Id: I13f53f581487f643acf160f53d02e9af7d54cfd1
Reviewed-on: https://pdfium-review.googlesource.com/40151
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
| -rw-r--r-- | core/fpdfapi/render/cpdf_dibsource.cpp | 5 | ||||
| -rw-r--r-- | core/fpdfapi/render/cpdf_dibsource.h | 6 | ||||
| -rw-r--r-- | fpdfsdk/fpdf_editimg.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/core/fpdfapi/render/cpdf_dibsource.cpp b/core/fpdfapi/render/cpdf_dibsource.cpp index fec439a689..0c69852354 100644 --- a/core/fpdfapi/render/cpdf_dibsource.cpp +++ b/core/fpdfapi/render/cpdf_dibsource.cpp @@ -705,8 +705,9 @@ bool CPDF_DIBSource::IsJBigImage() const { CPDF_DIBSource::LoadState CPDF_DIBSource::StartLoadMaskDIB() { m_pMask = pdfium::MakeRetain<CPDF_DIBSource>(); - LoadState ret = m_pMask->StartLoadDIBSource( - m_pDocument.Get(), m_pMaskStream.Get(), false, nullptr, nullptr, true); + LoadState ret = + m_pMask->StartLoadDIBSource(m_pDocument.Get(), m_pMaskStream.Get(), false, + nullptr, nullptr, true, 0, false); if (ret == LoadState::kContinue) { if (m_Status == LoadState::kFail) m_Status = LoadState::kContinue; diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h index fc390c2f6f..597390cd18 100644 --- a/core/fpdfapi/render/cpdf_dibsource.h +++ b/core/fpdfapi/render/cpdf_dibsource.h @@ -68,9 +68,9 @@ class CPDF_DIBSource : public CFX_DIBSource { bool bHasMask, const CPDF_Dictionary* pFormResources, CPDF_Dictionary* pPageResources, - bool bStdCS = false, - uint32_t GroupFamily = 0, - bool bLoadMask = false); + bool bStdCS, + uint32_t GroupFamily, + bool bLoadMask); LoadState ContinueLoadDIBSource(PauseIndicatorIface* pPause); RetainPtr<CPDF_DIBSource> DetachMask(); diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp index 7aa93e98ec..8235a8c25f 100644 --- a/fpdfsdk/fpdf_editimg.cpp +++ b/fpdfsdk/fpdf_editimg.cpp @@ -316,7 +316,7 @@ FPDFImageObj_GetImageMetadata(FPDF_PAGEOBJECT image_object, auto pSource = pdfium::MakeRetain<CPDF_DIBSource>(); CPDF_DIBSource::LoadState ret = pSource->StartLoadDIBSource( pPage->GetDocument(), pImg->GetStream(), false, nullptr, - pPage->m_pPageResources.Get()); + pPage->m_pPageResources.Get(), false, 0, false); if (ret == CPDF_DIBSource::LoadState::kFail) return true; |