summaryrefslogtreecommitdiff
path: root/core/fpdfapi/fpdf_page
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi/fpdf_page')
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_allstates.cpp2
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_colorspace.cpp16
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_image.cpp14
-rw-r--r--core/fpdfapi/fpdf_page/cpdf_textstate.cpp4
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_colors.cpp2
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_doc.cpp4
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_parser.cpp32
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp18
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_colorspace.h2
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_form.h2
-rw-r--r--core/fpdfapi/fpdf_page/include/cpdf_image.h6
-rw-r--r--core/fpdfapi/fpdf_page/pageint.h2
12 files changed, 52 insertions, 52 deletions
diff --git a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp b/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
index 4fe5283251..5230b3b206 100644
--- a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
@@ -126,7 +126,7 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS,
FXSYS_memcpy(pGeneralState->m_SMaskMatrix,
&pParser->GetCurStates()->m_CTM, sizeof(CFX_Matrix));
} else {
- pGeneralState->m_pSoftMask = NULL;
+ pGeneralState->m_pSoftMask = nullptr;
}
break;
case FXBSTR_ID('C', 'A', 0, 0):
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp b/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp
index d66b920f07..9300f1081b 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp
@@ -325,7 +325,7 @@ CPDF_ColorSpace* CPDF_ColorSpace::ColorspaceFromName(
if (name == "Pattern") {
return CPDF_ColorSpace::GetStockCS(PDFCS_PATTERN);
}
- return NULL;
+ return nullptr;
}
CPDF_ColorSpace* CPDF_ColorSpace::GetStockCS(int family) {
@@ -366,7 +366,7 @@ CPDF_ColorSpace* CPDF_ColorSpace::Load(CPDF_Document* pDoc, CPDF_Object* pObj) {
if (pArray->GetCount() == 1)
return ColorspaceFromName(familyname);
- CPDF_ColorSpace* pCS = NULL;
+ CPDF_ColorSpace* pCS = nullptr;
uint32_t id = familyname.GetID();
if (id == FXBSTR_ID('C', 'a', 'l', 'G')) {
pCS = new CPDF_CalGray(pDoc);
@@ -386,12 +386,12 @@ CPDF_ColorSpace* CPDF_ColorSpace::Load(CPDF_Document* pDoc, CPDF_Object* pObj) {
} else if (id == FXBSTR_ID('P', 'a', 't', 't')) {
pCS = new CPDF_PatternCS(pDoc);
} else {
- return NULL;
+ return nullptr;
}
pCS->m_pArray = pArray;
if (!pCS->v_Load(pDoc, pArray)) {
pCS->ReleaseCS();
- return NULL;
+ return nullptr;
}
return pCS;
}
@@ -965,7 +965,7 @@ CPDF_IndexedCS::CPDF_IndexedCS(CPDF_Document* pDoc)
CPDF_IndexedCS::~CPDF_IndexedCS() {
FX_Free(m_pCompMinMax);
- CPDF_ColorSpace* pCS = m_pCountedBaseCS ? m_pCountedBaseCS->get() : NULL;
+ CPDF_ColorSpace* pCS = m_pCountedBaseCS ? m_pCountedBaseCS->get() : nullptr;
if (pCS && m_pDocument) {
m_pDocument->GetPageData()->ReleaseColorSpace(pCS->GetArray());
}
@@ -980,7 +980,7 @@ FX_BOOL CPDF_IndexedCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) {
return FALSE;
}
CPDF_DocPageData* pDocPageData = pDoc->GetPageData();
- m_pBaseCS = pDocPageData->GetColorSpace(pBaseObj, NULL);
+ m_pBaseCS = pDocPageData->GetColorSpace(pBaseObj, nullptr);
if (!m_pBaseCS) {
return FALSE;
}
@@ -1052,7 +1052,7 @@ CPDF_PatternCS::CPDF_PatternCS(CPDF_Document* pDoc)
m_pCountedBaseCS(nullptr) {}
CPDF_PatternCS::~CPDF_PatternCS() {
- CPDF_ColorSpace* pCS = m_pCountedBaseCS ? m_pCountedBaseCS->get() : NULL;
+ CPDF_ColorSpace* pCS = m_pCountedBaseCS ? m_pCountedBaseCS->get() : nullptr;
if (pCS && m_pDocument) {
m_pDocument->GetPageData()->ReleaseColorSpace(pCS->GetArray());
}
@@ -1064,7 +1064,7 @@ FX_BOOL CPDF_PatternCS::v_Load(CPDF_Document* pDoc, CPDF_Array* pArray) {
return FALSE;
}
CPDF_DocPageData* pDocPageData = pDoc->GetPageData();
- m_pBaseCS = pDocPageData->GetColorSpace(pBaseCS, NULL);
+ m_pBaseCS = pDocPageData->GetColorSpace(pBaseCS, nullptr);
if (m_pBaseCS) {
if (m_pBaseCS->GetFamily() == PDFCS_PATTERN) {
return FALSE;
diff --git a/core/fpdfapi/fpdf_page/cpdf_image.cpp b/core/fpdfapi/fpdf_page/cpdf_image.cpp
index d7e50d8291..63e006fc06 100644
--- a/core/fpdfapi/fpdf_page/cpdf_image.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_image.cpp
@@ -58,7 +58,7 @@ FX_BOOL CPDF_Image::LoadImageF(CPDF_Stream* pStream, FX_BOOL bInline) {
m_pStream = pStream;
if (m_bInline && m_pInlineDict) {
m_pInlineDict->Release();
- m_pInlineDict = NULL;
+ m_pInlineDict = nullptr;
}
m_bInline = bInline;
CPDF_Dictionary* pDict = pStream->GetDict();
@@ -168,7 +168,7 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap, int32_t iCompress) {
pDict->SetAtName("Subtype", "Image");
pDict->SetAtInteger("Width", BitmapWidth);
pDict->SetAtInteger("Height", BitmapHeight);
- uint8_t* dest_buf = NULL;
+ uint8_t* dest_buf = nullptr;
FX_STRSIZE dest_pitch = 0, dest_size = 0, opType = -1;
if (bpp == 1) {
int32_t reset_a = 0, reset_r = 0, reset_g = 0, reset_b = 0;
@@ -252,7 +252,7 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap, int32_t iCompress) {
opType = 0;
}
}
- const CFX_DIBitmap* pMaskBitmap = NULL;
+ const CFX_DIBitmap* pMaskBitmap = nullptr;
FX_BOOL bDeleteMask = FALSE;
if (pBitmap->HasAlpha()) {
pMaskBitmap = pBitmap->GetAlphaMask();
@@ -261,7 +261,7 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap, int32_t iCompress) {
if (pMaskBitmap) {
int32_t maskWidth = pMaskBitmap->GetWidth();
int32_t maskHeight = pMaskBitmap->GetHeight();
- uint8_t* mask_buf = NULL;
+ uint8_t* mask_buf = nullptr;
FX_STRSIZE mask_size = 0;
CPDF_Dictionary* pMaskDict = new CPDF_Dictionary;
pMaskDict->SetAtName("Type", "XObject");
@@ -301,10 +301,10 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap, int32_t iCompress) {
SetImage(pNewBitmap, iCompress);
if (pDict) {
pDict->Release();
- pDict = NULL;
+ pDict = nullptr;
}
FX_Free(dest_buf);
- dest_buf = NULL;
+ dest_buf = nullptr;
dest_size = 0;
delete pNewBitmap;
return;
@@ -343,7 +343,7 @@ void CPDF_Image::SetImage(const CFX_DIBitmap* pBitmap, int32_t iCompress) {
}
}
if (!m_pStream) {
- m_pStream = new CPDF_Stream(NULL, 0, NULL);
+ m_pStream = new CPDF_Stream(nullptr, 0, nullptr);
}
m_pStream->InitStream(dest_buf, dest_size, pDict);
m_bIsMask = pBitmap->IsAlphaMask();
diff --git a/core/fpdfapi/fpdf_page/cpdf_textstate.cpp b/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
index 5269cae44b..50fc7789fe 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
@@ -13,11 +13,11 @@ void CPDF_TextState::SetFont(CPDF_Font* pFont) {
CPDF_TextStateData* pStateData = GetModify();
if (pStateData) {
CPDF_Document* pDoc = pStateData->m_pDocument;
- CPDF_DocPageData* pPageData = pDoc ? pDoc->GetPageData() : NULL;
+ CPDF_DocPageData* pPageData = pDoc ? pDoc->GetPageData() : nullptr;
if (pPageData && pStateData->m_pFont && !pPageData->IsForceClear()) {
pPageData->ReleaseFont(pStateData->m_pFont->GetFontDict());
}
- pStateData->m_pDocument = pFont ? pFont->m_pDocument : NULL;
+ pStateData->m_pDocument = pFont ? pFont->m_pDocument : nullptr;
pStateData->m_pFont = pFont;
}
}
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp
index 2256fda585..6fd7621a51 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp
@@ -217,7 +217,7 @@ void CPDF_DeviceCS::TranslateImageLine(uint8_t* pDestBuf,
}
CPDF_IccProfile::CPDF_IccProfile(const uint8_t* pData, uint32_t dwSize)
- : m_bsRGB(FALSE), m_pTransform(NULL), m_nSrcComponents(0) {
+ : m_bsRGB(FALSE), m_pTransform(nullptr), m_nSrcComponents(0) {
if (dwSize == 3144 &&
FXSYS_memcmp(pData + 0x190, "sRGB IEC61966-2.1", 17) == 0) {
m_bsRGB = TRUE;
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
index ae02cfb4a7..e7f68224a4 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
@@ -128,7 +128,7 @@ void CPDF_DocPageData::Clear(FX_BOOL bForceRelease) {
CPDF_Font* CPDF_DocPageData::GetFont(CPDF_Dictionary* pFontDict,
FX_BOOL findOnly) {
if (!pFontDict) {
- return NULL;
+ return nullptr;
}
if (findOnly) {
auto it = m_FontMap.find(pFontDict);
@@ -434,7 +434,7 @@ void CPDF_DocPageData::ReleaseImage(CPDF_Object* pImageStream) {
CPDF_IccProfile* CPDF_DocPageData::GetIccProfile(
CPDF_Stream* pIccProfileStream) {
if (!pIccProfileStream)
- return NULL;
+ return nullptr;
auto it = m_IccProfileMap.find(pIccProfileStream);
if (it != m_IccProfileMap.end()) {
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index 4bd4a4d529..802f424274 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -82,7 +82,7 @@ class CPDF_StreamParserAutoClearer {
: scoped_variable_(scoped_variable) {
*scoped_variable_ = new_parser;
}
- ~CPDF_StreamParserAutoClearer() { *scoped_variable_ = NULL; }
+ ~CPDF_StreamParserAutoClearer() { *scoped_variable_ = nullptr; }
private:
CPDF_StreamParser** scoped_variable_;
@@ -321,7 +321,7 @@ void CPDF_StreamContentParser::ClearAllParams() {
CPDF_Object* CPDF_StreamContentParser::GetObject(uint32_t index) {
if (index >= m_ParamCount) {
- return NULL;
+ return nullptr;
}
int real_index = m_ParamStartPos + m_ParamCount - index - 1;
if (real_index >= PARAM_BUF_SIZE) {
@@ -348,7 +348,7 @@ CPDF_Object* CPDF_StreamContentParser::GetObject(uint32_t index) {
return param.m_pObject;
}
ASSERT(FALSE);
- return NULL;
+ return nullptr;
}
CFX_ByteString CPDF_StreamContentParser::GetString(uint32_t index) {
@@ -612,7 +612,7 @@ void CPDF_StreamContentParser::Handle_BeginImage() {
}
}
PDF_ReplaceAbbr(pDict);
- CPDF_Object* pCSObj = NULL;
+ CPDF_Object* pCSObj = nullptr;
if (pDict->KeyExist("ColorSpace")) {
pCSObj = pDict->GetDirectObjectBy("ColorSpace");
if (pCSObj->IsName()) {
@@ -642,7 +642,7 @@ void CPDF_StreamContentParser::Handle_BeginImage() {
}
}
pDict->SetAtName("Subtype", "Image");
- CPDF_ImageObject* pImgObj = AddImage(pStream, NULL, TRUE);
+ CPDF_ImageObject* pImgObj = AddImage(pStream, nullptr, TRUE);
if (!pImgObj) {
if (pStream) {
pStream->Release();
@@ -654,7 +654,7 @@ void CPDF_StreamContentParser::Handle_BeginImage() {
void CPDF_StreamContentParser::Handle_BeginMarkedContent() {
CFX_ByteString tag = GetString(0);
- m_CurContentMark.GetModify()->AddMark(tag, NULL, FALSE);
+ m_CurContentMark.GetModify()->AddMark(tag, nullptr, FALSE);
}
void CPDF_StreamContentParser::Handle_BeginText() {
@@ -738,7 +738,7 @@ void CPDF_StreamContentParser::Handle_ExecuteXObject() {
type = pXObject->GetDict()->GetStringBy("Subtype");
if (type == "Image") {
- CPDF_ImageObject* pObj = AddImage(pXObject, NULL, FALSE);
+ CPDF_ImageObject* pObj = AddImage(pXObject, nullptr, FALSE);
m_LastImageName = name;
m_pLastImage = pObj->m_pImage;
if (!m_pObjectHolder->HasImageMask())
@@ -773,7 +773,7 @@ CPDF_ImageObject* CPDF_StreamContentParser::AddImage(CPDF_Stream* pStream,
CPDF_Image* pImage,
FX_BOOL bInline) {
if (!pStream && !pImage) {
- return NULL;
+ return nullptr;
}
CFX_Matrix ImageMatrix;
ImageMatrix.Copy(m_pCurStates->m_CTM);
@@ -1010,7 +1010,7 @@ void CPDF_StreamContentParser::Handle_SetColor_Fill() {
for (int i = 0; i < nargs; i++) {
values[i] = GetNumber(nargs - i - 1);
}
- m_pCurStates->m_ColorState.SetFillColor(NULL, values, nargs);
+ m_pCurStates->m_ColorState.SetFillColor(nullptr, values, nargs);
}
void CPDF_StreamContentParser::Handle_SetColor_Stroke() {
@@ -1022,7 +1022,7 @@ void CPDF_StreamContentParser::Handle_SetColor_Stroke() {
for (int i = 0; i < nargs; i++) {
values[i] = GetNumber(nargs - i - 1);
}
- m_pCurStates->m_ColorState.SetStrokeColor(NULL, values, nargs);
+ m_pCurStates->m_ColorState.SetStrokeColor(nullptr, values, nargs);
}
void CPDF_StreamContentParser::Handle_SetColorPS_Fill() {
@@ -1034,7 +1034,7 @@ void CPDF_StreamContentParser::Handle_SetColorPS_Fill() {
uint32_t nvalues = nargs;
if (pLastParam->IsName())
nvalues--;
- FX_FLOAT* values = NULL;
+ FX_FLOAT* values = nullptr;
if (nvalues) {
values = FX_Alloc(FX_FLOAT, nvalues);
for (uint32_t i = 0; i < nvalues; i++) {
@@ -1047,7 +1047,7 @@ void CPDF_StreamContentParser::Handle_SetColorPS_Fill() {
m_pCurStates->m_ColorState.SetFillPattern(pPattern, values, nvalues);
}
} else {
- m_pCurStates->m_ColorState.SetFillColor(NULL, values, nvalues);
+ m_pCurStates->m_ColorState.SetFillColor(nullptr, values, nvalues);
}
FX_Free(values);
}
@@ -1062,7 +1062,7 @@ void CPDF_StreamContentParser::Handle_SetColorPS_Stroke() {
if (pLastParam->IsName())
nvalues--;
- FX_FLOAT* values = NULL;
+ FX_FLOAT* values = nullptr;
if (nvalues) {
values = FX_Alloc(FX_FLOAT, nvalues);
for (int i = 0; i < nvalues; i++) {
@@ -1075,7 +1075,7 @@ void CPDF_StreamContentParser::Handle_SetColorPS_Stroke() {
m_pCurStates->m_ColorState.SetStrokePattern(pPattern, values, nvalues);
}
} else {
- m_pCurStates->m_ColorState.SetStrokeColor(NULL, values, nvalues);
+ m_pCurStates->m_ColorState.SetStrokeColor(nullptr, values, nvalues);
}
FX_Free(values);
}
@@ -1189,7 +1189,7 @@ CPDF_ColorSpace* CPDF_StreamContentParser::FindColorSpace(
CPDF_Object* pCSObj = FindResourceObj("ColorSpace", name);
if (!pCSObj) {
m_bResourceMissing = TRUE;
- return NULL;
+ return nullptr;
}
return m_pDocument->LoadColorSpace(pCSObj);
}
@@ -1284,7 +1284,7 @@ void CPDF_StreamContentParser::Handle_ShowText() {
if (str.IsEmpty()) {
return;
}
- AddTextObject(&str, 0, NULL, 1);
+ AddTextObject(&str, 0, nullptr, 1);
}
void CPDF_StreamContentParser::Handle_ShowText_Positioning() {
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index 5bac23e137..42adb84638 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -43,7 +43,7 @@ CPDF_StreamParser::CPDF_StreamParser(const uint8_t* pData, uint32_t dwSize) {
m_pBuf = pData;
m_Size = dwSize;
m_Pos = 0;
- m_pLastObj = NULL;
+ m_pLastObj = nullptr;
}
CPDF_StreamParser::~CPDF_StreamParser() {
@@ -168,30 +168,30 @@ CPDF_Stream* CPDF_StreamParser::ReadInlineStream(CPDF_Document* pDoc,
}
uint32_t pitch = width;
if (bpc && pitch > INT_MAX / bpc) {
- return NULL;
+ return nullptr;
}
pitch *= bpc;
if (nComponents && pitch > INT_MAX / nComponents) {
- return NULL;
+ return nullptr;
}
pitch *= nComponents;
if (pitch > INT_MAX - 7) {
- return NULL;
+ return nullptr;
}
pitch += 7;
pitch /= 8;
OrigSize = pitch;
} else {
if (width > INT_MAX - 7) {
- return NULL;
+ return nullptr;
}
OrigSize = ((width + 7) / 8);
}
if (height && OrigSize > INT_MAX / height) {
- return NULL;
+ return nullptr;
}
OrigSize *= height;
- uint8_t* pData = NULL;
+ uint8_t* pData = nullptr;
uint32_t dwStreamSize;
if (Decoder.IsEmpty()) {
if (OrigSize > m_Size - m_Pos) {
@@ -208,7 +208,7 @@ CPDF_Stream* CPDF_StreamParser::ReadInlineStream(CPDF_Document* pDoc,
Decoder, pParam, pData, dwDestSize);
FX_Free(pData);
if ((int)dwStreamSize < 0)
- return NULL;
+ return nullptr;
uint32_t dwSavePos = m_Pos;
m_Pos += dwStreamSize;
@@ -714,7 +714,7 @@ void CPDF_ContentParser::Start(CPDF_Form* pForm,
pData->m_BlendType = FXDIB_BLEND_NORMAL;
pData->m_StrokeAlpha = 1.0f;
pData->m_FillAlpha = 1.0f;
- pData->m_pSoftMask = NULL;
+ pData->m_pSoftMask = nullptr;
}
m_nStreams = 0;
m_pSingleStream.reset(new CPDF_StreamAcc);
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;
diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h
index b2204d8dbf..29fd6fb86e 100644
--- a/core/fpdfapi/fpdf_page/pageint.h
+++ b/core/fpdfapi/fpdf_page/pageint.h
@@ -52,7 +52,7 @@ class CPDF_StreamParser {
uint32_t GetWordSize() const { return m_WordSize; }
CPDF_Object* GetObject() {
CPDF_Object* pObj = m_pLastObj;
- m_pLastObj = NULL;
+ m_pLastObj = nullptr;
return pObj;
}
uint32_t GetPos() const { return m_Pos; }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 08:55:19 +0000