core/fxge/include/fx_ge.h - Issue 2032613003: Get rid of NULLs in core/

Unified Diff: core/fxge/include/fx_ge.h

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

Index: core/fxge/include/fx_ge.h

diff --git a/core/fxge/include/fx_ge.h b/core/fxge/include/fx_ge.h

index 6a3113d0708c1963c8124b462965c7ac32512ed3..92d14eb41b985381e93b68ba4b62ea23b25b8081 100644

--- a/core/fxge/include/fx_ge.h

+++ b/core/fxge/include/fx_ge.h

@@ -423,7 +423,7 @@ class IFX_RenderDeviceDriver {

static IFX_RenderDeviceDriver* CreateFxgeDriver(

CFX_DIBitmap* pBitmap,

FX_BOOL bRgbByteOrder = FALSE,

- CFX_DIBitmap* pOriDevice = NULL,

+ CFX_DIBitmap* pOriDevice = nullptr,

FX_BOOL bGroupKnockout = FALSE);

virtual ~IFX_RenderDeviceDriver() {}

@@ -459,21 +459,21 @@ class IFX_RenderDeviceDriver {

uint32_t stroke_color,

int fill_mode,

int alpha_flag = 0,

- void* pIccTransform = NULL,

+ void* pIccTransform = nullptr,

int blend_type = FXDIB_BLEND_NORMAL) = 0;

virtual FX_BOOL SetPixel(int x,

int y,

uint32_t color,

int alpha_flag = 0,

- void* pIccTransform = NULL) {

+ void* pIccTransform = nullptr) {

return FALSE;

}

virtual FX_BOOL FillRect(const FX_RECT* pRect,

uint32_t fill_color,

int alpha_flag = 0,

- void* pIccTransform = NULL,

+ void* pIccTransform = nullptr,

int blend_type = FXDIB_BLEND_NORMAL) {

return FALSE;

}

@@ -484,7 +484,7 @@ class IFX_RenderDeviceDriver {

FX_FLOAT y2,

uint32_t color,

int alpha_flag = 0,

- void* pIccTransform = NULL,

+ void* pIccTransform = nullptr,

int blend_type = FXDIB_BLEND_NORMAL) {

return FALSE;

}

@@ -494,11 +494,11 @@ class IFX_RenderDeviceDriver {

virtual FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap,

int left,

int top,

- void* pIccTransform = NULL,

+ void* pIccTransform = nullptr,

FX_BOOL bDEdge = FALSE) {

return FALSE;

}

- virtual CFX_DIBitmap* GetBackDrop() { return NULL; }

+ virtual CFX_DIBitmap* GetBackDrop() { return nullptr; }

virtual FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap,

uint32_t color,

@@ -507,7 +507,7 @@ class IFX_RenderDeviceDriver {

int dest_top,

int blend_type,

int alpha_flag = 0,

- void* pIccTransform = NULL) = 0;

+ void* pIccTransform = nullptr) = 0;

virtual FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap,

uint32_t color,

@@ -518,7 +518,7 @@ class IFX_RenderDeviceDriver {

const FX_RECT* pClipRect,

uint32_t flags,

int alpha_flag = 0,

- void* pIccTransform = NULL,

+ void* pIccTransform = nullptr,

int blend_type = FXDIB_BLEND_NORMAL) = 0;

virtual FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,

@@ -528,7 +528,7 @@ class IFX_RenderDeviceDriver {

uint32_t flags,

void*& handle,

int alpha_flag = 0,

- void* pIccTransform = NULL,

+ void* pIccTransform = nullptr,

int blend_type = FXDIB_BLEND_NORMAL) = 0;

virtual FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause) {

@@ -545,11 +545,11 @@ class IFX_RenderDeviceDriver {

FX_FLOAT font_size,

uint32_t color,

int alpha_flag = 0,

- void* pIccTransform = NULL) {

+ void* pIccTransform = nullptr) {

return FALSE;

}

- virtual void* GetPlatformSurface() const { return NULL; }

+ virtual void* GetPlatformSurface() const { return nullptr; }

virtual int GetDriverType() const { return 0; }

virtual void ClearDriver() {}

@@ -599,13 +599,13 @@ class CFX_PSRenderer {

uint32_t stroke_color,

int fill_mode,

int alpha_flag = 0,

- void* pIccTransform = NULL);

+ void* pIccTransform = nullptr);

FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap,

uint32_t color,

int dest_left,

int dest_top,

int alpha_flag = 0,

- void* pIccTransform = NULL);

+ void* pIccTransform = nullptr);

FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap,

uint32_t color,

int dest_left,

@@ -614,13 +614,13 @@ class CFX_PSRenderer {

int dest_height,

uint32_t flags,

int alpha_flag = 0,

- void* pIccTransform = NULL);

+ void* pIccTransform = nullptr);

FX_BOOL DrawDIBits(const CFX_DIBSource* pBitmap,

uint32_t color,

const CFX_Matrix* pMatrix,

uint32_t flags,

int alpha_flag = 0,

- void* pIccTransform = NULL);

+ void* pIccTransform = nullptr);

FX_BOOL DrawText(int nChars,

const FXTEXT_CHARPOS* pCharPos,

CFX_Font* pFont,

@@ -629,7 +629,7 @@ class CFX_PSRenderer {

FX_FLOAT font_size,

uint32_t color,

int alpha_flag = 0,

- void* pIccTransform = NULL);

+ void* pIccTransform = nullptr);

private:

void OutputPath(const CFX_PathData* pPathData,

« core/fxge/apple/fx_quartz_device.cpp ('K') | « core/fxge/include/fx_font.h ('k') | core/fxge/include/fx_ge_win32.h » ('j') | core/fxge/win32/fx_win32_dib.cpp » ('J')