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/lbmp | |
| 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/lbmp')
| -rw-r--r-- | core/fxcodec/lbmp/fx_bmp.cpp | 2 | ||||
| -rw-r--r-- | core/fxcodec/lbmp/fx_bmp.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fxcodec/lbmp/fx_bmp.cpp b/core/fxcodec/lbmp/fx_bmp.cpp index 6d4fb51fcd..c31886dcfd 100644 --- a/core/fxcodec/lbmp/fx_bmp.cpp +++ b/core/fxcodec/lbmp/fx_bmp.cpp @@ -34,7 +34,7 @@ void SetWord_LSBFirst(uint8_t* p, uint16_t v) { p[0] = (uint8_t)v; p[1] = (uint8_t)(v >> 8); } -void bmp_error(bmp_decompress_struct_p bmp_ptr, const FX_CHAR* err_msg) { +void bmp_error(bmp_decompress_struct_p bmp_ptr, const char* err_msg) { if (bmp_ptr && bmp_ptr->bmp_error_fn) { bmp_ptr->bmp_error_fn(bmp_ptr, err_msg); } diff --git a/core/fxcodec/lbmp/fx_bmp.h b/core/fxcodec/lbmp/fx_bmp.h index b0233d1ef0..5d1f799fd1 100644 --- a/core/fxcodec/lbmp/fx_bmp.h +++ b/core/fxcodec/lbmp/fx_bmp.h @@ -70,8 +70,8 @@ typedef bmp_decompress_struct* bmp_decompress_struct_p; 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); + char* err_ptr; + void (*bmp_error_fn)(bmp_decompress_struct_p gif_ptr, const char* err_msg); void* context_ptr; @@ -111,7 +111,7 @@ struct tag_bmp_decompress_struct { uint32_t skip_size; int32_t decode_status; }; -void bmp_error(bmp_decompress_struct_p bmp_ptr, const FX_CHAR* err_msg); +void bmp_error(bmp_decompress_struct_p bmp_ptr, const 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); |