diff options
| author | thestig <thestig@chromium.org> | 2016-06-07 10:46:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-07 10:46:23 -0700 |
| commit | 4997b22f84307521a62838f874928bf56cd3423c (patch) | |
| tree | ad11d99ac0a491ee222e9d0a42ec3b6ad3354e2a /core/fpdfapi/fpdf_page/include | |
| parent | 0687e76dc259c678b3f29a6608331f07ffd8f1e2 (diff) | |
| download | pdfium-4997b22f84307521a62838f874928bf56cd3423c.tar.xz | |
Get rid of NULLs in core/
Review-Url: https://codereview.chromium.org/2032613003
Diffstat (limited to 'core/fpdfapi/fpdf_page/include')
| -rw-r--r-- | core/fpdfapi/fpdf_page/include/cpdf_colorspace.h | 2 | ||||
| -rw-r--r-- | core/fpdfapi/fpdf_page/include/cpdf_form.h | 2 | ||||
| -rw-r--r-- | core/fpdfapi/fpdf_page/include/cpdf_image.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h index 48ace36835..8bb6c57260 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h @@ -79,7 +79,7 @@ class CPDF_ColorSpace { FX_BOOL bTransMask = FALSE) const; CPDF_Array*& GetArray() { return m_pArray; } - virtual CPDF_ColorSpace* GetBaseCS() const { return NULL; } + virtual CPDF_ColorSpace* GetBaseCS() const { return nullptr; } virtual void EnableStdConversion(FX_BOOL bEnabled); diff --git a/core/fpdfapi/fpdf_page/include/cpdf_form.h b/core/fpdfapi/fpdf_page/include/cpdf_form.h index d36a976176..92acbca25a 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_form.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_form.h @@ -21,7 +21,7 @@ class CPDF_Form : public CPDF_PageObjectHolder { CPDF_Form(CPDF_Document* pDocument, CPDF_Dictionary* pPageResources, CPDF_Stream* pFormStream, - CPDF_Dictionary* pParentResources = NULL); + CPDF_Dictionary* pParentResources = nullptr); ~CPDF_Form(); diff --git a/core/fpdfapi/fpdf_page/include/cpdf_image.h b/core/fpdfapi/fpdf_page/include/cpdf_image.h index 48349deb3b..f475e53478 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_image.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_image.h @@ -39,7 +39,7 @@ class CPDF_Image { CPDF_Dictionary* GetInlineDict() const { return m_pInlineDict; } CPDF_Stream* GetStream() const { return m_pStream; } CPDF_Dictionary* GetDict() const { - return m_pStream ? m_pStream->GetDict() : NULL; + return m_pStream ? m_pStream->GetDict() : nullptr; } CPDF_Dictionary* GetOC() const { return m_pOC; } CPDF_Document* GetDocument() const { return m_pDocument; } @@ -51,8 +51,8 @@ class CPDF_Image { FX_BOOL IsMask() const { return m_bIsMask; } FX_BOOL IsInterpol() const { return m_bInterpolate; } - CFX_DIBSource* LoadDIBSource(CFX_DIBSource** ppMask = NULL, - uint32_t* pMatteColor = NULL, + CFX_DIBSource* LoadDIBSource(CFX_DIBSource** ppMask = nullptr, + uint32_t* pMatteColor = nullptr, FX_BOOL bStdCS = FALSE, uint32_t GroupFamily = 0, FX_BOOL bLoadMask = FALSE) const; |