| Index: core/fxge/include/fx_ge.h
|
| diff --git a/core/fxge/include/fx_ge.h b/core/fxge/include/fx_ge.h
|
| index 1cbbc2cc97f76ee5d5ebf85fc112ac04402802a5..040c16afa2d1baaa7aa7f6b85c9d8fb566522726 100644
|
| --- a/core/fxge/include/fx_ge.h
|
| +++ b/core/fxge/include/fx_ge.h
|
| @@ -424,7 +424,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() {}
|
| @@ -458,21 +458,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;
|
| }
|
| @@ -483,7 +483,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;
|
| }
|
| @@ -493,11 +493,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,
|
| @@ -506,7 +506,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,
|
| @@ -517,7 +517,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,
|
| @@ -527,7 +527,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) {
|
| @@ -544,11 +544,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() {}
|
|
|
|
|