| Index: core/fxge/win32/fx_win32_print.cpp
|
| diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp
|
| index e46beeefbd6434736211e0d3ee7b7e1c4e4143e3..9a582efd272fb93f06abdad8914696edd8f2c9d7 100644
|
| --- a/core/fxge/win32/fx_win32_print.cpp
|
| +++ b/core/fxge/win32/fx_win32_print.cpp
|
| @@ -278,7 +278,7 @@ FX_BOOL CGdiPrinterDriver::StartDIBits(const CFX_DIBSource* pSource,
|
|
|
| CPSOutput::CPSOutput(HDC hDC) {
|
| m_hDC = hDC;
|
| - m_pBuf = NULL;
|
| + m_pBuf = nullptr;
|
| }
|
| CPSOutput::~CPSOutput() {
|
| FX_Free(m_pBuf);
|
| @@ -295,13 +295,13 @@ void CPSOutput::OutputPS(const FX_CHAR* str, int len) {
|
| int send_len = len > 1024 ? 1024 : len;
|
| *(uint16_t*)m_pBuf = send_len;
|
| FXSYS_memcpy(m_pBuf + 2, str + sent_len, send_len);
|
| - ExtEscape(m_hDC, PASSTHROUGH, send_len + 2, m_pBuf, 0, NULL);
|
| + ExtEscape(m_hDC, PASSTHROUGH, send_len + 2, m_pBuf, 0, nullptr);
|
| sent_len += send_len;
|
| len -= send_len;
|
| }
|
| }
|
| CPSPrinterDriver::CPSPrinterDriver() {
|
| - m_pPSOutput = NULL;
|
| + m_pPSOutput = nullptr;
|
| m_bCmykOutput = FALSE;
|
| }
|
| CPSPrinterDriver::~CPSPrinterDriver() {
|
| @@ -322,7 +322,7 @@ FX_BOOL CPSPrinterDriver::Init(HDC hDC, int pslevel, FX_BOOL bCmykOutput) {
|
| HRGN hRgn = ::CreateRectRgn(0, 0, 1, 1);
|
| int ret = ::GetClipRgn(hDC, hRgn);
|
| if (ret == 1) {
|
| - ret = ::GetRegionData(hRgn, 0, NULL);
|
| + ret = ::GetRegionData(hRgn, 0, nullptr);
|
| if (ret) {
|
| RGNDATA* pData = (RGNDATA*)FX_Alloc(uint8_t, ret);
|
| ret = ::GetRegionData(hRgn, ret, pData);
|
| @@ -334,7 +334,7 @@ FX_BOOL CPSPrinterDriver::Init(HDC hDC, int pslevel, FX_BOOL bCmykOutput) {
|
| path.AppendRect((FX_FLOAT)pRect->left, (FX_FLOAT)pRect->bottom,
|
| (FX_FLOAT)pRect->right, (FX_FLOAT)pRect->top);
|
| }
|
| - m_PSRenderer.SetClip_PathFill(&path, NULL, FXFILL_WINDING);
|
| + m_PSRenderer.SetClip_PathFill(&path, nullptr, FXFILL_WINDING);
|
| }
|
| FX_Free(pData);
|
| }
|
| @@ -455,7 +455,7 @@ FX_BOOL CPSPrinterDriver::StartDIBits(const CFX_DIBSource* pBitmap,
|
| if (bitmap_alpha < 255) {
|
| return FALSE;
|
| }
|
| - handle = NULL;
|
| + handle = nullptr;
|
| return m_PSRenderer.DrawDIBits(pBitmap, color, pMatrix, render_flags,
|
| alpha_flag, pIccTransform);
|
| }
|
|
|