diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-14 18:22:06 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-14 18:22:06 +0000 |
| commit | b9c3e2712f75363372622282023143b86b72f2df (patch) | |
| tree | b8b4443fbf792143ade73b0fdd2ccf3e50c9a1e1 /core/fpdfapi | |
| parent | f46d49b52d39f8a56e40a95e0d9d2b574301fa04 (diff) | |
| download | pdfium-b9c3e2712f75363372622282023143b86b72f2df.tar.xz | |
Remove more default arg = nullptr cases.
Bring in line with standards.
Remove argument entirely for mac code that is always nullptr.
Change-Id: I0710bdbd51fc0bc2e1d428ef44976be39a631147
Reviewed-on: https://pdfium-review.googlesource.com/40091
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi')
| -rw-r--r-- | core/fpdfapi/page/cpdf_streamcontentparser.cpp | 4 | ||||
| -rw-r--r-- | core/fpdfapi/page/cpdf_streamparser.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfapi/parser/cpdf_document.h | 2 | ||||
| -rw-r--r-- | core/fpdfapi/render/cpdf_renderstatus.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp index 860f6d6b3b..d0be6b3193 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp +++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp @@ -1201,14 +1201,14 @@ CPDF_ColorSpace* CPDF_StreamContentParser::FindColorSpace( } return CPDF_ColorSpace::GetStockCS(PDFCS_DEVICECMYK); } - return m_pDocument->LoadColorSpace(pDefObj); + return m_pDocument->LoadColorSpace(pDefObj, nullptr); } const CPDF_Object* pCSObj = FindResourceObj("ColorSpace", name); if (!pCSObj) { m_bResourceMissing = true; return nullptr; } - return m_pDocument->LoadColorSpace(pCSObj); + return m_pDocument->LoadColorSpace(pCSObj, nullptr); } CPDF_Pattern* CPDF_StreamContentParser::FindPattern(const ByteString& name, diff --git a/core/fpdfapi/page/cpdf_streamparser.cpp b/core/fpdfapi/page/cpdf_streamparser.cpp index 8652490a22..4b27cb32f3 100644 --- a/core/fpdfapi/page/cpdf_streamparser.cpp +++ b/core/fpdfapi/page/cpdf_streamparser.cpp @@ -141,7 +141,7 @@ std::unique_ptr<CPDF_Stream> CPDF_StreamParser::ReadInlineStream( if (pCSObj) { uint32_t bpc = pDict->GetIntegerFor("BitsPerComponent"); uint32_t nComponents = 1; - CPDF_ColorSpace* pCS = pDoc->LoadColorSpace(pCSObj); + CPDF_ColorSpace* pCS = pDoc->LoadColorSpace(pCSObj, nullptr); if (pCS) { nComponents = pCS->CountComponents(); pDoc->GetPageData()->ReleaseColorSpace(pCSObj); diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h index 81860a926d..8261441f64 100644 --- a/core/fpdfapi/parser/cpdf_document.h +++ b/core/fpdfapi/parser/cpdf_document.h @@ -90,7 +90,7 @@ class CPDF_Document : public Observable<CPDF_Document>, // |pFontDict| must not be null. CPDF_Font* LoadFont(CPDF_Dictionary* pFontDict); CPDF_ColorSpace* LoadColorSpace(const CPDF_Object* pCSObj, - const CPDF_Dictionary* pResources = nullptr); + const CPDF_Dictionary* pResources); CPDF_Pattern* LoadPattern(CPDF_Object* pObj, bool bShading, diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 568e350302..85e446f1a5 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -2633,7 +2633,7 @@ FX_ARGB CPDF_RenderStatus::GetBackColor(const CPDF_Dictionary* pSMaskDict, if (pGroup) pCSObj = pGroup->GetDirectObjectFor(pdfium::transparency::kCS); const CPDF_ColorSpace* pCS = - m_pContext->GetDocument()->LoadColorSpace(pCSObj); + m_pContext->GetDocument()->LoadColorSpace(pCSObj, nullptr); if (!pCS) return kDefaultColor; |