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

Unified Diff: core/fxge/ge/fx_ge_ps.cpp

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: s/NULL/nullptr/ Created 4 years, 7 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
Index: core/fxge/ge/fx_ge_ps.cpp
diff --git a/core/fxge/ge/fx_ge_ps.cpp b/core/fxge/ge/fx_ge_ps.cpp
index b112cf363047b8f69172965cc4c1adb755da7364..4bbb7ebe642e399062a6b74a3b2079f56f5280f3 100644
--- a/core/fxge/ge/fx_ge_ps.cpp
+++ b/core/fxge/ge/fx_ge_ps.cpp
@@ -21,7 +21,7 @@ class CPSFont {
int m_nGlyphs;
};
CFX_PSRenderer::CFX_PSRenderer() {
- m_pOutput = NULL;
+ m_pOutput = nullptr;
m_bColorSet = m_bGraphStateSet = FALSE;
m_bInited = FALSE;
}
@@ -170,7 +170,7 @@ void CFX_PSRenderer::SetClip_PathStroke(const CFX_PathData* pPathData,
<< pObject2Device->e << " " << pObject2Device->f << "]cm ";
m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize());
}
- OutputPath(pPathData, NULL);
+ OutputPath(pPathData, nullptr);
CFX_FloatRect rect = pPathData->GetBoundingBox(pGraphState->m_LineWidth,
pGraphState->m_MiterLimit);
rect.Transform(pObject2Device);
@@ -215,7 +215,7 @@ FX_BOOL CFX_PSRenderer::DrawPath(const CFX_PathData* pPathData,
m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize());
}
}
- OutputPath(pPathData, stroke_alpha ? NULL : pObject2Device);
+ OutputPath(pPathData, stroke_alpha ? nullptr : pObject2Device);
if (fill_mode && fill_alpha) {
SetColor(fill_color, alpha_flag, pIccTransform);
if ((fill_mode & 3) == FXFILL_WINDING) {
@@ -305,7 +305,7 @@ static void PSCompressData(int PSLevel,
return;
}
CCodec_ModuleMgr* pEncoders = CFX_GEModule::Get()->GetCodecModule();
- uint8_t* dest_buf = NULL;
+ uint8_t* dest_buf = nullptr;
uint32_t dest_size = src_size;
if (PSLevel >= 3) {
if (pEncoders &&
@@ -324,7 +324,7 @@ static void PSCompressData(int PSLevel,
output_buf = dest_buf;
output_size = dest_size;
} else {
- filter = NULL;
+ filter = nullptr;
FX_Free(dest_buf);
}
}
@@ -416,7 +416,7 @@ FX_BOOL CFX_PSRenderer::DrawDIBits(const CFX_DIBSource* pSource,
CFX_DIBSource* pConverted = (CFX_DIBSource*)pSource;
if (pIccTransform) {
FXDIB_Format format = m_bCmykOutput ? FXDIB_Cmyk : FXDIB_Rgb;
- pConverted = pSource->CloneConvert(format, NULL, pIccTransform);
+ pConverted = pSource->CloneConvert(format, nullptr, pIccTransform);
} else {
switch (pSource->GetFormat()) {
case FXDIB_1bppRgb:
@@ -445,9 +445,9 @@ FX_BOOL CFX_PSRenderer::DrawDIBits(const CFX_DIBSource* pSource,
return FALSE;
}
int Bpp = pConverted->GetBPP() / 8;
- uint8_t* output_buf = NULL;
+ uint8_t* output_buf = nullptr;
FX_STRSIZE output_size = 0;
- const FX_CHAR* filter = NULL;
+ const FX_CHAR* filter = nullptr;
if (flags & FXRENDER_IMAGE_LOSSY) {
CCodec_ModuleMgr* pEncoders = CFX_GEModule::Get()->GetCodecModule();
if (pEncoders &&
@@ -486,7 +486,7 @@ FX_BOOL CFX_PSRenderer::DrawDIBits(const CFX_DIBSource* pSource,
}
if (pConverted != pSource) {
delete pConverted;
- pConverted = NULL;
+ pConverted = nullptr;
}
buf << " 8[";
buf << width << " 0 0 -" << height << " 0 " << height << "]";
@@ -508,7 +508,7 @@ void CFX_PSRenderer::SetColor(uint32_t color,
void* pIccTransform) {
if (!CFX_GEModule::Get()->GetCodecModule() ||
!CFX_GEModule::Get()->GetCodecModule()->GetIccModule()) {
- pIccTransform = NULL;
+ pIccTransform = nullptr;
}
FX_BOOL bCMYK = FALSE;
if (pIccTransform) {

Powered by Google App Engine
This is Rietveld 408576698