diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-13 16:43:37 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 14:14:51 +0000 |
| commit | 812e96c2b4c5908a1979da5e27cdcecda0d1dfc9 (patch) | |
| tree | f0b0607f6b757eb22237527215094bd87b5d03ba /core/fxcodec/lgif | |
| parent | 893822aa5b6254591f8e80fbffcbb4fa6ad849aa (diff) | |
| download | pdfium-812e96c2b4c5908a1979da5e27cdcecda0d1dfc9.tar.xz | |
Replace FX_CHAR and FX_WCHAR with underlying types.
Change-Id: I96e0a20d66b9184d22f64d8e4ce0dadd5a78c1e8
Reviewed-on: https://pdfium-review.googlesource.com/2967
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcodec/lgif')
| -rw-r--r-- | core/fxcodec/lgif/fx_gif.cpp | 10 | ||||
| -rw-r--r-- | core/fxcodec/lgif/fx_gif.h | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/core/fxcodec/lgif/fx_gif.cpp b/core/fxcodec/lgif/fx_gif.cpp index d62dacb36c..c4661b0acd 100644 --- a/core/fxcodec/lgif/fx_gif.cpp +++ b/core/fxcodec/lgif/fx_gif.cpp @@ -18,7 +18,7 @@ uint32_t CGifLZWDecoder::GetAvailInput() { return avail_in; } -CGifLZWDecoder::CGifLZWDecoder(FX_CHAR* error_ptr) +CGifLZWDecoder::CGifLZWDecoder(char* error_ptr) : code_size(0), code_size_cur(0), code_clear(0), @@ -506,12 +506,12 @@ void gif_destroy_compress(gif_compress_struct_pp gif_ptr_ptr) { FX_Free(gif_ptr->pte_ptr); FX_Free(gif_ptr); } -void gif_error(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg) { +void gif_error(gif_decompress_struct_p gif_ptr, const char* err_msg) { if (gif_ptr && gif_ptr->gif_error_fn) { gif_ptr->gif_error_fn(gif_ptr, err_msg); } } -void gif_warn(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg) {} +void gif_warn(gif_decompress_struct_p gif_ptr, const char* err_msg) {} int32_t gif_read_header(gif_decompress_struct_p gif_ptr) { if (!gif_ptr) return 0; @@ -680,7 +680,7 @@ int32_t gif_decode_extension(gif_decompress_struct_p gif_ptr) { return 2; } *(gif_ptr->cmt_data_ptr) += - CFX_ByteString((const FX_CHAR*)data_ptr, data_size); + CFX_ByteString((const char*)data_ptr, data_size); } } break; case GIF_D_STATUS_EXT_PTE: { @@ -731,7 +731,7 @@ int32_t gif_decode_extension(gif_decompress_struct_p gif_ptr) { return 2; } *(gif_pt_ptr->string_ptr) += - CFX_ByteString((const FX_CHAR*)data_ptr, data_size); + CFX_ByteString((const char*)data_ptr, data_size); } gif_ptr->pt_ptr_arr_ptr->push_back(gif_pt_ptr); } break; diff --git a/core/fxcodec/lgif/fx_gif.h b/core/fxcodec/lgif/fx_gif.h index a8b780b099..5027c447d5 100644 --- a/core/fxcodec/lgif/fx_gif.h +++ b/core/fxcodec/lgif/fx_gif.h @@ -122,7 +122,7 @@ class CGifLZWDecoder { uint8_t suffix; }; - explicit CGifLZWDecoder(FX_CHAR* error_ptr); + explicit CGifLZWDecoder(char* error_ptr); ~CGifLZWDecoder(); void InitTable(uint8_t code_len); @@ -152,7 +152,7 @@ class CGifLZWDecoder { uint8_t bits_left; uint32_t code_store; - FX_CHAR* err_msg_ptr; + char* err_msg_ptr; }; class CGifLZWEncoder { @@ -208,8 +208,8 @@ typedef gif_decompress_struct_p* gif_decompress_struct_pp; static const int32_t s_gif_interlace_step[4] = {8, 8, 4, 2}; struct tag_gif_decompress_struct { jmp_buf jmpbuf; - FX_CHAR* err_ptr; - void (*gif_error_fn)(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg); + char* err_ptr; + void (*gif_error_fn)(gif_decompress_struct_p gif_ptr, const char* err_msg); void* context_ptr; int width; int height; @@ -280,8 +280,8 @@ struct tag_gif_compress_struct { uint32_t pte_data_len; }; -void gif_error(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg); -void gif_warn(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg); +void gif_error(gif_decompress_struct_p gif_ptr, const char* err_msg); +void gif_warn(gif_decompress_struct_p gif_ptr, const char* err_msg); gif_decompress_struct_p gif_create_decompress(); void gif_destroy_decompress(gif_decompress_struct_pp gif_ptr_ptr); gif_compress_struct_p gif_create_compress(); |