Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1525)

Unified Diff: core/fpdfapi/fpdf_page/include/cpdf_image.h

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fpdfapi/fpdf_page/include/cpdf_form.h ('k') | core/fpdfapi/fpdf_page/pageint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fpdfapi/fpdf_page/include/cpdf_image.h
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_image.h b/core/fpdfapi/fpdf_page/include/cpdf_image.h
index 48349deb3b6c25eeff1c16101c9fb09f454233be..f475e534781f76d5e2d41128758d18f90bf28e8c 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;
« no previous file with comments | « core/fpdfapi/fpdf_page/include/cpdf_form.h ('k') | core/fpdfapi/fpdf_page/pageint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698