Index: core/fxge/apple/apple_int.h |
diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h |
index ddfa792cf45a7c07ff464c720237a8b257d1622c..5ba210ff8963ea1be4aa36e9b853b666c11c1cf8 100644 |
--- a/core/fxge/apple/apple_int.h |
+++ b/core/fxge/apple/apple_int.h |
@@ -66,7 +66,7 @@ class CQuartz2D { |
CGPoint* glyphPositions, |
int32_t chars, |
FX_ARGB argb, |
- CFX_Matrix* matrix = NULL); |
+ CFX_Matrix* matrix = nullptr); |
void saveGraphicsState(void* graphics); |
void restoreGraphicsState(void* graphics); |
}; |
@@ -105,19 +105,19 @@ class CFX_QuartzDeviceDriver : public 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) override; |
FX_BOOL SetPixel(int x, |
int y, |
uint32_t color, |
int alpha_flag = 0, |
- void* pIccTransform = NULL) override { |
+ void* pIccTransform = nullptr) override { |
return FALSE; |
} |
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) override; |
FX_BOOL DrawCosmeticLine(FX_FLOAT x1, |
FX_FLOAT y1, |
@@ -125,15 +125,15 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { |
FX_FLOAT y2, |
uint32_t color, |
int alpha_flag = 0, |
- void* pIccTransform = NULL, |
+ void* pIccTransform = nullptr, |
int blend_type = FXDIB_BLEND_NORMAL) override; |
FX_BOOL GetClipBox(FX_RECT* pRect) override; |
FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, |
int left, |
int top, |
- void* pIccTransform = NULL, |
+ void* pIccTransform = nullptr, |
FX_BOOL bDEdge = FALSE) override; |
- CFX_DIBitmap* GetBackDrop() override { return NULL; } |
+ CFX_DIBitmap* GetBackDrop() override { return nullptr; } |
FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap, |
uint32_t color, |
const FX_RECT* pSrcRect, |
@@ -141,7 +141,7 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { |
int dest_top, |
int blend_type, |
int alpha_flag = 0, |
- void* pIccTransform = NULL) override; |
+ void* pIccTransform = nullptr) override; |
FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap, |
uint32_t color, |
int dest_left, |
@@ -151,7 +151,7 @@ class CFX_QuartzDeviceDriver : public 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) override; |
FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, |
int bitmap_alpha, |
@@ -160,7 +160,7 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { |
uint32_t flags, |
void*& handle, |
int alpha_flag = 0, |
- void* pIccTransform = NULL, |
+ void* pIccTransform = nullptr, |
int blend_type = FXDIB_BLEND_NORMAL) override { |
return FALSE; |
} |
@@ -176,8 +176,8 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { |
FX_FLOAT font_size, |
uint32_t color, |
int alpha_flag = 0, |
- void* pIccTransform = NULL) override; |
- void* GetPlatformSurface() const override { return NULL; } |
+ void* pIccTransform = nullptr) override; |
+ void* GetPlatformSurface() const override { return nullptr; } |
void ClearDriver() override; |
protected: |
@@ -202,7 +202,7 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { |
int dest_top, |
int dest_width, |
int dest_height, |
- CGRect* rect = NULL); |
+ CGRect* rect = nullptr); |
CGContextRef m_context; |
CGAffineTransform m_foxitDevice2User; |