| Index: core/src/fxcodec/codec/fx_codec.cpp
|
| diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp
|
| index c325cccdd4e868a5bdc88f6659f59bbf585b2f41..ee3ef8ce9d3679846f4c4cd5640992ff27a798b3 100644
|
| --- a/core/src/fxcodec/codec/fx_codec.cpp
|
| +++ b/core/src/fxcodec/codec/fx_codec.cpp
|
| @@ -119,7 +119,7 @@ void CCodec_ScanlineDecoder::DownScale(int dest_width, int dest_height)
|
| FX_Free(m_pDataCache);
|
| m_pDataCache = NULL;
|
| }
|
| - m_pDataCache = (CCodec_ImageDataCache*)FX_TryAlloc(FX_BYTE, sizeof(CCodec_ImageDataCache) + m_Pitch * m_OutputHeight);
|
| + m_pDataCache = (CCodec_ImageDataCache*)FX_TryAlloc(uint8_t, sizeof(CCodec_ImageDataCache) + m_Pitch * m_OutputHeight);
|
| if (m_pDataCache == NULL) {
|
| return;
|
| }
|
| @@ -127,7 +127,7 @@ void CCodec_ScanlineDecoder::DownScale(int dest_width, int dest_height)
|
| m_pDataCache->m_Width = m_OutputWidth;
|
| m_pDataCache->m_nCachedLines = 0;
|
| }
|
| -FX_BOOL CCodec_BasicModule::RunLengthEncode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf,
|
| +FX_BOOL CCodec_BasicModule::RunLengthEncode(const uint8_t* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf,
|
| FX_DWORD& dest_size)
|
| {
|
| return FALSE;
|
| @@ -236,7 +236,7 @@ extern "C" double FXstrtod(const char* nptr, char** endptr)
|
| }
|
| return is_negative ? -ret : ret;
|
| }
|
| -FX_BOOL CCodec_BasicModule::A85Encode(const FX_BYTE* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf,
|
| +FX_BOOL CCodec_BasicModule::A85Encode(const uint8_t* src_buf, FX_DWORD src_size, FX_LPBYTE& dest_buf,
|
| FX_DWORD& dest_size)
|
| {
|
| return FALSE;
|
| @@ -265,7 +265,7 @@ public:
|
| protected:
|
| FX_BOOL CheckDestSize();
|
| void GetNextOperator();
|
| - void UpdateOperator(FX_BYTE used_bytes);
|
| + void UpdateOperator(uint8_t used_bytes);
|
|
|
| FX_LPBYTE m_pScanline;
|
| FX_LPCBYTE m_pSrcBuf;
|
| @@ -273,7 +273,7 @@ protected:
|
| FX_DWORD m_dwLineBytes;
|
| FX_DWORD m_SrcOffset;
|
| FX_BOOL m_bEOD;
|
| - FX_BYTE m_Operator;
|
| + uint8_t m_Operator;
|
| };
|
| CCodec_RLScanlineDecoder::CCodec_RLScanlineDecoder()
|
| : m_pScanline(NULL)
|
| @@ -332,7 +332,7 @@ FX_BOOL CCodec_RLScanlineDecoder::Create(FX_LPCBYTE src_buf, FX_DWORD src_size,
|
| m_DownScale = 1;
|
| m_Pitch = (width * nComps * bpc + 31) / 32 * 4;
|
| m_dwLineBytes = (width * nComps * bpc + 7) / 8;
|
| - m_pScanline = FX_Alloc(FX_BYTE, m_Pitch);
|
| + m_pScanline = FX_Alloc(uint8_t, m_Pitch);
|
| return CheckDestSize();
|
| }
|
| FX_BOOL CCodec_RLScanlineDecoder::v_Rewind()
|
| @@ -368,7 +368,7 @@ FX_LPBYTE CCodec_RLScanlineDecoder::v_GetNextLine()
|
| }
|
| FXSYS_memcpy32(m_pScanline + col_pos, m_pSrcBuf + m_SrcOffset, copy_len);
|
| col_pos += copy_len;
|
| - UpdateOperator((FX_BYTE)copy_len);
|
| + UpdateOperator((uint8_t)copy_len);
|
| } else if (m_Operator > 128) {
|
| int fill = 0;
|
| if (m_SrcOffset - 1 < m_SrcSize - 1) {
|
| @@ -381,7 +381,7 @@ FX_LPBYTE CCodec_RLScanlineDecoder::v_GetNextLine()
|
| }
|
| FXSYS_memset8(m_pScanline + col_pos, fill, duplicate_len);
|
| col_pos += duplicate_len;
|
| - UpdateOperator((FX_BYTE)duplicate_len);
|
| + UpdateOperator((uint8_t)duplicate_len);
|
| } else {
|
| m_bEOD = TRUE;
|
| break;
|
| @@ -398,7 +398,7 @@ void CCodec_RLScanlineDecoder::GetNextOperator()
|
| m_Operator = m_pSrcBuf[m_SrcOffset];
|
| m_SrcOffset ++;
|
| }
|
| -void CCodec_RLScanlineDecoder::UpdateOperator(FX_BYTE used_bytes)
|
| +void CCodec_RLScanlineDecoder::UpdateOperator(uint8_t used_bytes)
|
| {
|
| if (used_bytes == 0) {
|
| return;
|
| @@ -417,7 +417,7 @@ void CCodec_RLScanlineDecoder::UpdateOperator(FX_BYTE used_bytes)
|
| }
|
| return;
|
| }
|
| - FX_BYTE count = 257 - m_Operator;
|
| + uint8_t count = 257 - m_Operator;
|
| FXSYS_assert((FX_DWORD)count >= used_bytes);
|
| if (used_bytes == count) {
|
| m_SrcOffset ++;
|
|
|