| Index: core/src/fxcodec/lbmp/fx_bmp.h
|
| diff --git a/core/src/fxcodec/lbmp/fx_bmp.h b/core/src/fxcodec/lbmp/fx_bmp.h
|
| index 063b1bd757882792734cdaddb1580e3b830005e4..24c94cabbe809373b8944b8bdb673a08cef784ea 100644
|
| --- a/core/src/fxcodec/lbmp/fx_bmp.h
|
| +++ b/core/src/fxcodec/lbmp/fx_bmp.h
|
| @@ -11,7 +11,6 @@
|
|
|
| #include "core/include/fxcrt/fx_basic.h"
|
|
|
| -#define BMP_SUPPORT_BITFIELD
|
| #define BMP_WIDTHBYTES(width, bitCount) ((width * bitCount) + 31) / 32 * 4
|
| #define BMP_PAL_ENCODE(a, r, g, b) \
|
| (((FX_DWORD)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))
|
| @@ -70,8 +69,7 @@ typedef bmp_decompress_struct_p* bmp_decompress_struct_pp;
|
| struct tag_bmp_decompress_struct {
|
| jmp_buf jmpbuf;
|
| FX_CHAR* err_ptr;
|
| - void (*_bmp_error_fn)(bmp_decompress_struct_p gif_ptr,
|
| - const FX_CHAR* err_msg);
|
| + void (*bmp_error_fn)(bmp_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
|
|
|
| void* context_ptr;
|
|
|
| @@ -97,39 +95,37 @@ struct tag_bmp_decompress_struct {
|
| int32_t col_num;
|
| int32_t dpi_x;
|
| int32_t dpi_y;
|
| -#ifdef BMP_SUPPORT_BITFIELD
|
| FX_DWORD mask_red;
|
| FX_DWORD mask_green;
|
| FX_DWORD mask_blue;
|
| -#endif
|
|
|
| - FX_BOOL (*_bmp_get_data_position_fn)(bmp_decompress_struct_p bmp_ptr,
|
| + FX_BOOL (*bmp_get_data_position_fn)(bmp_decompress_struct_p bmp_ptr,
|
| FX_DWORD cur_pos);
|
| - void (*_bmp_get_row_fn)(bmp_decompress_struct_p bmp_ptr,
|
| - int32_t row_num,
|
| - uint8_t* row_buf);
|
| + void (*bmp_get_row_fn)(bmp_decompress_struct_p bmp_ptr,
|
| + int32_t row_num,
|
| + uint8_t* row_buf);
|
| uint8_t* next_in;
|
| FX_DWORD avail_in;
|
| FX_DWORD skip_size;
|
| int32_t decode_status;
|
| };
|
| -void _bmp_error(bmp_decompress_struct_p bmp_ptr, const FX_CHAR* err_msg);
|
| -bmp_decompress_struct_p _bmp_create_decompress();
|
| -void _bmp_destroy_decompress(bmp_decompress_struct_pp bmp_ptr_ptr);
|
| -int32_t _bmp_read_header(bmp_decompress_struct_p bmp_ptr);
|
| -int32_t _bmp_decode_image(bmp_decompress_struct_p bmp_ptr);
|
| -int32_t _bmp_decode_rgb(bmp_decompress_struct_p bmp_ptr);
|
| -int32_t _bmp_decode_rle8(bmp_decompress_struct_p bmp_ptr);
|
| -int32_t _bmp_decode_rle4(bmp_decompress_struct_p bmp_ptr);
|
| -uint8_t* _bmp_read_data(bmp_decompress_struct_p bmp_ptr,
|
| - uint8_t** des_buf_pp,
|
| - FX_DWORD data_size);
|
| -void _bmp_save_decoding_status(bmp_decompress_struct_p bmp_ptr, int32_t status);
|
| -void _bmp_input_buffer(bmp_decompress_struct_p bmp_ptr,
|
| - uint8_t* src_buf,
|
| - FX_DWORD src_size);
|
| -FX_DWORD _bmp_get_avail_input(bmp_decompress_struct_p bmp_ptr,
|
| - uint8_t** avial_buf_ptr);
|
| +void bmp_error(bmp_decompress_struct_p bmp_ptr, const FX_CHAR* err_msg);
|
| +bmp_decompress_struct_p bmp_create_decompress();
|
| +void bmp_destroy_decompress(bmp_decompress_struct_pp bmp_ptr_ptr);
|
| +int32_t bmp_read_header(bmp_decompress_struct_p bmp_ptr);
|
| +int32_t bmp_decode_image(bmp_decompress_struct_p bmp_ptr);
|
| +int32_t bmp_decode_rgb(bmp_decompress_struct_p bmp_ptr);
|
| +int32_t bmp_decode_rle8(bmp_decompress_struct_p bmp_ptr);
|
| +int32_t bmp_decode_rle4(bmp_decompress_struct_p bmp_ptr);
|
| +uint8_t* bmp_read_data(bmp_decompress_struct_p bmp_ptr,
|
| + uint8_t** des_buf_pp,
|
| + FX_DWORD data_size);
|
| +void bmp_save_decoding_status(bmp_decompress_struct_p bmp_ptr, int32_t status);
|
| +void bmp_input_buffer(bmp_decompress_struct_p bmp_ptr,
|
| + uint8_t* src_buf,
|
| + FX_DWORD src_size);
|
| +FX_DWORD bmp_get_avail_input(bmp_decompress_struct_p bmp_ptr,
|
| + uint8_t** avial_buf_ptr);
|
| typedef struct tag_bmp_compress_struct bmp_compress_struct;
|
| typedef bmp_compress_struct* bmp_compress_struct_p;
|
| typedef bmp_compress_struct_p* bmp_compress_struct_pp;
|
| @@ -144,15 +140,16 @@ struct tag_bmp_compress_struct {
|
| FX_BOOL src_free;
|
| FX_DWORD* pal_ptr;
|
| FX_WORD pal_num;
|
| -#ifdef BMP_SUPPORT_BITFIELD
|
| uint8_t bit_type;
|
| -#endif
|
| };
|
|
|
| -bmp_compress_struct_p _bmp_create_compress();
|
| -void _bmp_destroy_compress(bmp_compress_struct_p bmp_ptr);
|
| -FX_BOOL _bmp_encode_image(bmp_compress_struct_p bmp_ptr,
|
| - uint8_t*& dst_buf,
|
| - FX_DWORD& dst_size);
|
| +bmp_compress_struct_p bmp_create_compress();
|
| +void bmp_destroy_compress(bmp_compress_struct_p bmp_ptr);
|
| +FX_BOOL bmp_encode_image(bmp_compress_struct_p bmp_ptr,
|
| + uint8_t*& dst_buf,
|
| + FX_DWORD& dst_size);
|
| +
|
| +FX_WORD GetWord_LSBFirst(uint8_t* p);
|
| +void SetWord_LSBFirst(uint8_t* p, FX_WORD v);
|
|
|
| #endif // CORE_SRC_FXCODEC_LBMP_FX_BMP_H_
|
|
|