| Index: core/src/fxge/win32/fx_win32_print.cpp
|
| diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp
|
| index 7740fbd87a43c459d24f2409793c7793999d664d..e921d4c7a93880290ae25dfc686d6cc53a56806f 100644
|
| --- a/core/src/fxge/win32/fx_win32_print.cpp
|
| +++ b/core/src/fxge/win32/fx_win32_print.cpp
|
| @@ -121,7 +121,7 @@ static CFX_DIBitmap* Transform1bppBitmap(const CFX_DIBSource* pSrc, const CFX_Af
|
| return NULL;
|
| }
|
| int src_width = pSrcBitmap->GetWidth(), src_height = pSrcBitmap->GetHeight();
|
| - FX_LPBYTE src_buf = pSrcBitmap->GetBuffer();
|
| + uint8_t* src_buf = pSrcBitmap->GetBuffer();
|
| FX_DWORD src_pitch = pSrcBitmap->GetPitch();
|
| FX_FLOAT dest_area = pDestMatrix->GetUnitArea();
|
| FX_FLOAT area_scale = FXSYS_Div((FX_FLOAT)(src_width * src_height), dest_area);
|
| @@ -152,12 +152,12 @@ static CFX_DIBitmap* Transform1bppBitmap(const CFX_DIBSource* pSrc, const CFX_Af
|
| return NULL;
|
| }
|
| pTempBitmap->CopyPalette(pSrc->GetPalette());
|
| - FX_LPBYTE dest_buf = pTempBitmap->GetBuffer();
|
| + uint8_t* dest_buf = pTempBitmap->GetBuffer();
|
| int dest_pitch = pTempBitmap->GetPitch();
|
| FXSYS_memset8(dest_buf, pSrc->IsAlphaMask() ? 0 : 0xff, dest_pitch * result_height);
|
| if (pSrcBitmap->IsAlphaMask()) {
|
| for (int dest_y = 0; dest_y < result_height; dest_y ++) {
|
| - FX_LPBYTE dest_scan = dest_buf + dest_y * dest_pitch;
|
| + uint8_t* dest_scan = dest_buf + dest_y * dest_pitch;
|
| for (int dest_x = 0; dest_x < result_width; dest_x ++) {
|
| int src_x, src_y;
|
| result2src_fix.Transform(dest_x, dest_y, src_x, src_y);
|
| @@ -172,7 +172,7 @@ static CFX_DIBitmap* Transform1bppBitmap(const CFX_DIBSource* pSrc, const CFX_Af
|
| }
|
| } else {
|
| for (int dest_y = 0; dest_y < result_height; dest_y ++) {
|
| - FX_LPBYTE dest_scan = dest_buf + dest_y * dest_pitch;
|
| + uint8_t* dest_scan = dest_buf + dest_y * dest_pitch;
|
| for (int dest_x = 0; dest_x < result_width; dest_x ++) {
|
| int src_x, src_y;
|
| result2src_fix.Transform(dest_x, dest_y, src_x, src_y);
|
| @@ -192,7 +192,7 @@ static CFX_DIBitmap* Transform1bppBitmap(const CFX_DIBSource* pSrc, const CFX_Af
|
| return pTempBitmap;
|
| }
|
| FX_BOOL CGdiPrinterDriver::StartDIBits(const CFX_DIBSource* pSource, int bitmap_alpha, FX_DWORD color,
|
| - const CFX_AffineMatrix* pMatrix, FX_DWORD render_flags, FX_LPVOID& handle,
|
| + const CFX_AffineMatrix* pMatrix, FX_DWORD render_flags, void*& handle,
|
| int alpha_flag, void* pIccTransform, int blend_type)
|
| {
|
| if (bitmap_alpha < 255 || pSource->HasAlpha() || (pSource->IsAlphaMask() && (pSource->GetBPP() != 1 || !m_bSupportROP))) {
|
| @@ -250,7 +250,7 @@ void CPSOutput::Init()
|
| {
|
| m_pBuf = FX_Alloc(FX_CHAR, 1026);
|
| }
|
| -void CPSOutput::OutputPS(FX_LPCSTR string, int len)
|
| +void CPSOutput::OutputPS(const FX_CHAR* string, int len)
|
| {
|
| if (len < 0) {
|
| len = (int)FXSYS_strlen(string);
|
| @@ -393,7 +393,7 @@ FX_BOOL CPSPrinterDriver::StretchDIBits(const CFX_DIBSource* pBitmap, FX_DWORD c
|
| return m_PSRenderer.StretchDIBits(pBitmap, color, dest_left, dest_top, dest_width, dest_height, flags, alpha_flag, pIccTransform);
|
| }
|
| FX_BOOL CPSPrinterDriver::StartDIBits(const CFX_DIBSource* pBitmap, int bitmap_alpha, FX_DWORD color,
|
| - const CFX_AffineMatrix* pMatrix, FX_DWORD render_flags, FX_LPVOID& handle,
|
| + const CFX_AffineMatrix* pMatrix, FX_DWORD render_flags, void*& handle,
|
| int alpha_flag, void* pIccTransform, int blend_type)
|
| {
|
| if (blend_type != FXDIB_BLEND_NORMAL) {
|
|
|