diff options
Diffstat (limited to 'core/src/fxge/dib/fx_dib_convert.cpp')
-rw-r--r-- | core/src/fxge/dib/fx_dib_convert.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/src/fxge/dib/fx_dib_convert.cpp b/core/src/fxge/dib/fx_dib_convert.cpp index c8de6cae7c..8e96379d37 100644 --- a/core/src/fxge/dib/fx_dib_convert.cpp +++ b/core/src/fxge/dib/fx_dib_convert.cpp @@ -287,7 +287,7 @@ FX_BOOL _ConvertBuffer_1bppMask2Gray(uint8_t* dest_buf, int dest_pitch, int widt reset_gray = 0x00; for (int row = 0; row < height; row ++) { uint8_t* dest_scan = dest_buf + row * dest_pitch; - FXSYS_memset8(dest_scan, reset_gray, width); + FXSYS_memset(dest_scan, reset_gray, width); const uint8_t* src_scan = pSrcBitmap->GetScanline(src_top + row); for (int col = src_left; col < src_left + width; col ++) { if (src_scan[col / 8] & (1 << (7 - col % 8))) { @@ -304,7 +304,7 @@ FX_BOOL _ConvertBuffer_8bppMask2Gray(uint8_t* dest_buf, int dest_pitch, int widt for (int row = 0; row < height; row ++) { uint8_t* dest_scan = dest_buf + row * dest_pitch; const uint8_t* src_scan = pSrcBitmap->GetScanline(src_top + row) + src_left; - FXSYS_memcpy32(dest_scan, src_scan, width); + FXSYS_memcpy(dest_scan, src_scan, width); } return TRUE; } @@ -350,7 +350,7 @@ FX_BOOL _ConvertBuffer_1bppPlt2Gray(uint8_t* dest_buf, int dest_pitch, int width } for (int row = 0; row < height; row ++) { uint8_t* dest_scan = dest_buf + row * dest_pitch; - FXSYS_memset8(dest_scan, gray[0], width); + FXSYS_memset(dest_scan, gray[0], width); const uint8_t* src_scan = pSrcBitmap->GetScanline(src_top + row); for (int col = src_left; col < src_left + width; col ++) { if (src_scan[col / 8] & (1 << (7 - col % 8))) { @@ -459,7 +459,7 @@ inline void _ConvertBuffer_IndexCopy(uint8_t* dest_buf, int dest_pitch, int widt if (pSrcBitmap->GetBPP() == 1) { for (int row = 0; row < height; row ++) { uint8_t* dest_scan = dest_buf + row * dest_pitch; - FXSYS_memset32(dest_scan, 0, width); + FXSYS_memset(dest_scan, 0, width); const uint8_t* src_scan = pSrcBitmap->GetScanline(src_top + row); for (int col = src_left; col < src_left + width; col ++) { if (src_scan[col / 8] & (1 << (7 - col % 8))) { @@ -472,7 +472,7 @@ inline void _ConvertBuffer_IndexCopy(uint8_t* dest_buf, int dest_pitch, int widt for (int row = 0; row < height; row ++) { uint8_t* dest_scan = dest_buf + row * dest_pitch; const uint8_t* src_scan = pSrcBitmap->GetScanline(src_top + row) + src_left; - FXSYS_memcpy32(dest_scan, src_scan, width); + FXSYS_memcpy(dest_scan, src_scan, width); } } } @@ -512,7 +512,7 @@ FX_BOOL _ConvertBuffer_Plt2PltRgb8(uint8_t* dest_buf, int dest_pitch, int width, dst_plt[i] = FXARGB_MAKE(0xff, r, g, b); } } else { - FXSYS_memcpy32(dst_plt, src_plt, plt_size * 4); + FXSYS_memcpy(dst_plt, src_plt, plt_size * 4); } } return TRUE; @@ -570,7 +570,7 @@ inline FX_BOOL _ConvertBuffer_Rgb2PltRgb8_NoTransform(uint8_t* dest_buf, int des } } } - FXSYS_memcpy32(dst_plt, pPalette, sizeof(FX_DWORD) * 256); + FXSYS_memcpy(dst_plt, pPalette, sizeof(FX_DWORD) * 256); return TRUE; } FX_BOOL _ConvertBuffer_Rgb2PltRgb8(uint8_t* dest_buf, int dest_pitch, int width, int height, @@ -738,7 +738,7 @@ FX_BOOL _ConvertBuffer_24bppRgb2Rgb24(uint8_t* dest_buf, int dest_pitch, int wid for (int row = 0; row < height; row ++) { uint8_t* dest_scan = dest_buf + row * dest_pitch; const uint8_t* src_scan = pSrcBitmap->GetScanline(src_top + row) + src_left * 3; - FXSYS_memcpy32(dest_scan, src_scan, width * 3); + FXSYS_memcpy(dest_scan, src_scan, width * 3); } } return TRUE; @@ -1002,7 +1002,7 @@ FX_BOOL CFX_DIBitmap::ConvertFormat(FXDIB_Format dest_format, void* pIccTransfor } CFX_DIBitmap* pAlphaMask = NULL; if (dest_format == FXDIB_Argb) { - FXSYS_memset8(dest_buf, 0xff, dest_pitch * m_Height + 4); + FXSYS_memset(dest_buf, 0xff, dest_pitch * m_Height + 4); if (m_pAlphaMask) { for (int row = 0; row < m_Height; row ++) { uint8_t* pDstScanline = dest_buf + row * dest_pitch + 3; |