Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / core / src / fxcodec / lbmp / fx_bmp.h
index 553a150..f3c6e5b 100644 (file)
@@ -64,8 +64,8 @@ typedef bmp_decompress_struct *bmp_decompress_struct_p;
 typedef bmp_decompress_struct_p *bmp_decompress_struct_pp;\r
 struct tag_bmp_decompress_struct {\r
     jmp_buf                    jmpbuf;\r
-    FX_LPSTR           err_ptr;\r
-    void                       (*_bmp_error_fn)(bmp_decompress_struct_p gif_ptr, FX_LPCSTR err_msg);\r
+    FX_CHAR*           err_ptr;\r
+    void                       (*_bmp_error_fn)(bmp_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);\r
 \r
     void*                      context_ptr;\r
 \r
@@ -77,7 +77,7 @@ struct tag_bmp_decompress_struct {
     int32_t            components;\r
     int32_t            src_row_bytes;\r
     int32_t            out_row_bytes;\r
-    FX_LPBYTE          out_row_buffer;\r
+    uint8_t*           out_row_buffer;\r
     FX_WORD                    bitCounts;\r
     FX_DWORD           color_used;\r
     FX_BOOL                    imgTB_flag;\r
@@ -98,13 +98,13 @@ struct tag_bmp_decompress_struct {
 #endif\r
 \r
     FX_BOOL                    (*_bmp_get_data_position_fn)(bmp_decompress_struct_p bmp_ptr, FX_DWORD cur_pos);\r
-    void                       (*_bmp_get_row_fn)(bmp_decompress_struct_p bmp_ptr, int32_t row_num, FX_LPBYTE row_buf);\r
-    FX_LPBYTE          next_in;\r
+    void                       (*_bmp_get_row_fn)(bmp_decompress_struct_p bmp_ptr, int32_t row_num, uint8_t* row_buf);\r
+    uint8_t*           next_in;\r
     FX_DWORD           avail_in;\r
     FX_DWORD           skip_size;\r
     int32_t            decode_status;\r
 };\r
-void _bmp_error(bmp_decompress_struct_p bmp_ptr, FX_LPCSTR err_msg);\r
+void _bmp_error(bmp_decompress_struct_p bmp_ptr, const FX_CHAR* err_msg);\r
 bmp_decompress_struct_p _bmp_create_decompress();\r
 void _bmp_destroy_decompress(bmp_decompress_struct_pp bmp_ptr_ptr);\r
 int32_t _bmp_read_header(bmp_decompress_struct_p bmp_ptr);\r
@@ -112,10 +112,10 @@ int32_t _bmp_decode_image(bmp_decompress_struct_p bmp_ptr);
 int32_t _bmp_decode_rgb(bmp_decompress_struct_p bmp_ptr);\r
 int32_t _bmp_decode_rle8(bmp_decompress_struct_p bmp_ptr);\r
 int32_t _bmp_decode_rle4(bmp_decompress_struct_p bmp_ptr);\r
-FX_LPBYTE _bmp_read_data(bmp_decompress_struct_p bmp_ptr, FX_LPBYTE* des_buf_pp, FX_DWORD data_size);\r
+uint8_t* _bmp_read_data(bmp_decompress_struct_p bmp_ptr, uint8_t** des_buf_pp, FX_DWORD data_size);\r
 void _bmp_save_decoding_status(bmp_decompress_struct_p bmp_ptr, int32_t status);\r
-void _bmp_input_buffer(bmp_decompress_struct_p bmp_ptr, FX_LPBYTE src_buf, FX_DWORD src_size);\r
-FX_DWORD _bmp_get_avail_input(bmp_decompress_struct_p bmp_ptr, FX_LPBYTE* avial_buf_ptr);\r
+void _bmp_input_buffer(bmp_decompress_struct_p bmp_ptr, uint8_t* src_buf, FX_DWORD src_size);\r
+FX_DWORD _bmp_get_avail_input(bmp_decompress_struct_p bmp_ptr, uint8_t** avial_buf_ptr);\r
 #define BMP_PTR_NOT_NULL(ptr,bmp_ptr)  if(ptr == NULL){                                                \\r
         _bmp_error(bmp_ptr,"Out Of Memory");\\r
         return 0;                                                      \\r
@@ -126,7 +126,7 @@ typedef bmp_compress_struct_p *bmp_compress_struct_pp;
 struct tag_bmp_compress_struct {\r
     BmpFileHeader      file_header;\r
     BmpInfoHeader      info_header;\r
-    FX_LPBYTE          src_buf;\r
+    uint8_t*           src_buf;\r
     FX_DWORD           src_pitch;\r
     FX_DWORD           src_row;\r
     uint8_t                    src_bpp;\r
@@ -140,4 +140,4 @@ struct tag_bmp_compress_struct {
 };\r
 bmp_compress_struct_p _bmp_create_compress();\r
 void _bmp_destroy_compress(bmp_compress_struct_p bmp_ptr);\r
-FX_BOOL _bmp_encode_image(bmp_compress_struct_p bmp_ptr, FX_LPBYTE& dst_buf, FX_DWORD& dst_size);\r
+FX_BOOL _bmp_encode_image(bmp_compress_struct_p bmp_ptr, uint8_t*& dst_buf, FX_DWORD& dst_size);\r