diff options
Diffstat (limited to 'core/src/fxcodec/codec')
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 4 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index db0c2eae4b..4c002772e7 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -257,7 +257,7 @@ static void _JpegEncode(const CFX_DIBSource* pSource, if (nComponents > 1) { uint8_t* dest_scan = line_buf; if (nComponents == 3) { - for (int i = 0; i < width; i++) { + for (FX_DWORD i = 0; i < width; i++) { dest_scan[0] = src_scan[2]; dest_scan[1] = src_scan[1]; dest_scan[2] = src_scan[0]; @@ -265,7 +265,7 @@ static void _JpegEncode(const CFX_DIBSource* pSource, src_scan += Bpp; } } else { - for (int i = 0; i < pitch; i++) { + for (FX_DWORD i = 0; i < pitch; i++) { *dest_scan++ = ~*src_scan++; } } diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index 9b0f42b343..616af36b00 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -658,7 +658,7 @@ class CJPX_Decoder { public: explicit CJPX_Decoder(bool use_colorspace); ~CJPX_Decoder(); - FX_BOOL Init(const unsigned char* src_data, int src_size); + FX_BOOL Init(const unsigned char* src_data, FX_DWORD src_size); void GetInfo(FX_DWORD* width, FX_DWORD* height, FX_DWORD* components); bool Decode(uint8_t* dest_buf, int pitch, @@ -666,7 +666,7 @@ class CJPX_Decoder { private: const uint8_t* m_SrcData; - int m_SrcSize; + FX_DWORD m_SrcSize; opj_image_t* image; opj_codec_t* l_codec; opj_stream_t* l_stream; @@ -692,12 +692,12 @@ CJPX_Decoder::~CJPX_Decoder() { } } -FX_BOOL CJPX_Decoder::Init(const unsigned char* src_data, int src_size) { +FX_BOOL CJPX_Decoder::Init(const unsigned char* src_data, FX_DWORD src_size) { static const unsigned char szJP2Header[] = { 0x00, 0x00, 0x00, 0x0c, 0x6a, 0x50, 0x20, 0x20, 0x0d, 0x0a, 0x87, 0x0a}; - if (!src_data || src_size < sizeof(szJP2Header)) { + if (!src_data || src_size < sizeof(szJP2Header)) return FALSE; - } + image = NULL; m_SrcData = src_data; m_SrcSize = src_size; |