From 4467dea020b2c19588cc06ce1ece46cd99f3c7df Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 25 Feb 2016 12:39:15 -0800 Subject: Rename some functions that start with underscore. Fix misc issues along the way. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1739623002 . --- core/src/fxcodec/codec/fx_codec_bmp.cpp | 40 ++++++++--------- core/src/fxcodec/codec/fx_codec_gif.cpp | 80 ++++++++++++++++----------------- 2 files changed, 60 insertions(+), 60 deletions(-) (limited to 'core/src/fxcodec/codec') diff --git a/core/src/fxcodec/codec/fx_codec_bmp.cpp b/core/src/fxcodec/codec/fx_codec_bmp.cpp index 042392c0d1..41a881d3ae 100644 --- a/core/src/fxcodec/codec/fx_codec_bmp.cpp +++ b/core/src/fxcodec/codec/fx_codec_bmp.cpp @@ -17,27 +17,27 @@ struct FXBMP_Context { void (*m_FreeFunc)(void*); }; extern "C" { -static void* _bmp_alloc_func(unsigned int size) { +static void* bmp_alloc_func(unsigned int size) { return FX_Alloc(char, size); } -static void _bmp_free_func(void* p) { +static void bmp_free_func(void* p) { FX_Free(p); } }; -static void _bmp_error_data(bmp_decompress_struct_p bmp_ptr, - const FX_CHAR* err_msg) { +static void bmp_error_data(bmp_decompress_struct_p bmp_ptr, + const FX_CHAR* err_msg) { FXSYS_strncpy((char*)bmp_ptr->err_ptr, err_msg, BMP_MAX_ERROR_SIZE - 1); longjmp(bmp_ptr->jmpbuf, 1); } -static void _bmp_read_scanline(bmp_decompress_struct_p bmp_ptr, - int32_t row_num, - uint8_t* row_buf) { +static void bmp_read_scanline(bmp_decompress_struct_p bmp_ptr, + int32_t row_num, + uint8_t* row_buf) { FXBMP_Context* p = (FXBMP_Context*)bmp_ptr->context_ptr; CCodec_BmpModule* pModule = (CCodec_BmpModule*)p->parent_ptr; pModule->ReadScanlineCallback(p->child_ptr, row_num, row_buf); } -static FX_BOOL _bmp_get_data_position(bmp_decompress_struct_p bmp_ptr, - FX_DWORD rcd_pos) { +static FX_BOOL bmp_get_data_position(bmp_decompress_struct_p bmp_ptr, + FX_DWORD rcd_pos) { FXBMP_Context* p = (FXBMP_Context*)bmp_ptr->context_ptr; CCodec_BmpModule* pModule = (CCodec_BmpModule*)p->parent_ptr; return pModule->InputImagePositionBufCallback(p->child_ptr, rcd_pos); @@ -51,27 +51,27 @@ void* CCodec_BmpModule::Start(void* pModule) { if (p == NULL) { return NULL; } - p->m_AllocFunc = _bmp_alloc_func; - p->m_FreeFunc = _bmp_free_func; + p->m_AllocFunc = bmp_alloc_func; + p->m_FreeFunc = bmp_free_func; p->bmp_ptr = NULL; p->parent_ptr = (void*)this; p->child_ptr = pModule; - p->bmp_ptr = _bmp_create_decompress(); + p->bmp_ptr = bmp_create_decompress(); if (p->bmp_ptr == NULL) { FX_Free(p); return NULL; } p->bmp_ptr->context_ptr = (void*)p; p->bmp_ptr->err_ptr = m_szLastError; - p->bmp_ptr->_bmp_error_fn = _bmp_error_data; - p->bmp_ptr->_bmp_get_row_fn = _bmp_read_scanline; - p->bmp_ptr->_bmp_get_data_position_fn = _bmp_get_data_position; + p->bmp_ptr->bmp_error_fn = bmp_error_data; + p->bmp_ptr->bmp_get_row_fn = bmp_read_scanline; + p->bmp_ptr->bmp_get_data_position_fn = bmp_get_data_position; return p; } void CCodec_BmpModule::Finish(void* pContext) { FXBMP_Context* p = (FXBMP_Context*)pContext; if (p) { - _bmp_destroy_decompress(&p->bmp_ptr); + bmp_destroy_decompress(&p->bmp_ptr); p->m_FreeFunc(p); } } @@ -87,7 +87,7 @@ int32_t CCodec_BmpModule::ReadHeader(void* pContext, if (setjmp(p->bmp_ptr->jmpbuf)) { return 0; } - int32_t ret = _bmp_read_header(p->bmp_ptr); + int32_t ret = bmp_read_header(p->bmp_ptr); if (ret != 1) { return ret; } @@ -110,16 +110,16 @@ int32_t CCodec_BmpModule::LoadImage(void* pContext) { if (setjmp(p->bmp_ptr->jmpbuf)) { return 0; } - return _bmp_decode_image(p->bmp_ptr); + return bmp_decode_image(p->bmp_ptr); } FX_DWORD CCodec_BmpModule::GetAvailInput(void* pContext, uint8_t** avial_buf_ptr) { FXBMP_Context* p = (FXBMP_Context*)pContext; - return _bmp_get_avail_input(p->bmp_ptr, avial_buf_ptr); + return bmp_get_avail_input(p->bmp_ptr, avial_buf_ptr); } void CCodec_BmpModule::Input(void* pContext, const uint8_t* src_buf, FX_DWORD src_size) { FXBMP_Context* p = (FXBMP_Context*)pContext; - _bmp_input_buffer(p->bmp_ptr, (uint8_t*)src_buf, src_size); + bmp_input_buffer(p->bmp_ptr, (uint8_t*)src_buf, src_size); } diff --git a/core/src/fxcodec/codec/fx_codec_gif.cpp b/core/src/fxcodec/codec/fx_codec_gif.cpp index af0c32ea9d..661732fb3f 100644 --- a/core/src/fxcodec/codec/fx_codec_gif.cpp +++ b/core/src/fxcodec/codec/fx_codec_gif.cpp @@ -17,51 +17,51 @@ struct FXGIF_Context { void (*m_FreeFunc)(void*); }; extern "C" { -static void* _gif_alloc_func(unsigned int size) { +static void* gif_alloc_func(unsigned int size) { return FX_Alloc(char, size); } -static void _gif_free_func(void* p) { +static void gif_free_func(void* p) { FX_Free(p); } }; -static void _gif_error_data(gif_decompress_struct_p gif_ptr, - const FX_CHAR* err_msg) { +static void gif_error_data(gif_decompress_struct_p gif_ptr, + const FX_CHAR* err_msg) { FXSYS_strncpy((char*)gif_ptr->err_ptr, err_msg, GIF_MAX_ERROR_SIZE - 1); longjmp(gif_ptr->jmpbuf, 1); } -static uint8_t* _gif_ask_buf_for_pal(gif_decompress_struct_p gif_ptr, - int32_t pal_size) { +static uint8_t* gif_ask_buf_for_pal(gif_decompress_struct_p gif_ptr, + int32_t pal_size) { FXGIF_Context* p = (FXGIF_Context*)gif_ptr->context_ptr; CCodec_GifModule* pModule = (CCodec_GifModule*)p->parent_ptr; return pModule->AskLocalPaletteBufCallback( - p->child_ptr, _gif_get_frame_num(gif_ptr), pal_size); + p->child_ptr, gif_get_frame_num(gif_ptr), pal_size); } -static void _gif_record_current_position(gif_decompress_struct_p gif_ptr, - FX_DWORD* cur_pos_ptr) { +static void gif_record_current_position(gif_decompress_struct_p gif_ptr, + FX_DWORD* cur_pos_ptr) { FXGIF_Context* p = (FXGIF_Context*)gif_ptr->context_ptr; CCodec_GifModule* pModule = (CCodec_GifModule*)p->parent_ptr; pModule->RecordCurrentPositionCallback(p->child_ptr, *cur_pos_ptr); } -static void _gif_read_scanline(gif_decompress_struct_p gif_ptr, - int32_t row_num, - uint8_t* row_buf) { +static void gif_read_scanline(gif_decompress_struct_p gif_ptr, + int32_t row_num, + uint8_t* row_buf) { FXGIF_Context* p = (FXGIF_Context*)gif_ptr->context_ptr; CCodec_GifModule* pModule = (CCodec_GifModule*)p->parent_ptr; pModule->ReadScanlineCallback(p->child_ptr, row_num, row_buf); } -static FX_BOOL _gif_get_record_position(gif_decompress_struct_p gif_ptr, - FX_DWORD cur_pos, - int32_t left, - int32_t top, - int32_t width, - int32_t height, - int32_t pal_num, - void* pal_ptr, - int32_t delay_time, - FX_BOOL user_input, - int32_t trans_index, - int32_t disposal_method, - FX_BOOL interlace) { +static FX_BOOL gif_get_record_position(gif_decompress_struct_p gif_ptr, + FX_DWORD cur_pos, + int32_t left, + int32_t top, + int32_t width, + int32_t height, + int32_t pal_num, + void* pal_ptr, + int32_t delay_time, + FX_BOOL user_input, + int32_t trans_index, + int32_t disposal_method, + FX_BOOL interlace) { FXGIF_Context* p = (FXGIF_Context*)gif_ptr->context_ptr; CCodec_GifModule* pModule = (CCodec_GifModule*)p->parent_ptr; return pModule->InputRecordPositionBufCallback( @@ -75,29 +75,29 @@ void* CCodec_GifModule::Start(void* pModule) { return NULL; } FXSYS_memset(p, 0, sizeof(FXGIF_Context)); - p->m_AllocFunc = _gif_alloc_func; - p->m_FreeFunc = _gif_free_func; + p->m_AllocFunc = gif_alloc_func; + p->m_FreeFunc = gif_free_func; p->gif_ptr = NULL; p->parent_ptr = (void*)this; p->child_ptr = pModule; - p->gif_ptr = _gif_create_decompress(); + p->gif_ptr = gif_create_decompress(); if (p->gif_ptr == NULL) { FX_Free(p); return NULL; } p->gif_ptr->context_ptr = (void*)p; p->gif_ptr->err_ptr = m_szLastError; - p->gif_ptr->_gif_error_fn = _gif_error_data; - p->gif_ptr->_gif_ask_buf_for_pal_fn = _gif_ask_buf_for_pal; - p->gif_ptr->_gif_record_current_position_fn = _gif_record_current_position; - p->gif_ptr->_gif_get_row_fn = _gif_read_scanline; - p->gif_ptr->_gif_get_record_position_fn = _gif_get_record_position; + p->gif_ptr->gif_error_fn = gif_error_data; + p->gif_ptr->gif_ask_buf_for_pal_fn = gif_ask_buf_for_pal; + p->gif_ptr->gif_record_current_position_fn = gif_record_current_position; + p->gif_ptr->gif_get_row_fn = gif_read_scanline; + p->gif_ptr->gif_get_record_position_fn = gif_get_record_position; return p; } void CCodec_GifModule::Finish(void* pContext) { FXGIF_Context* p = (FXGIF_Context*)pContext; if (p) { - _gif_destroy_decompress(&p->gif_ptr); + gif_destroy_decompress(&p->gif_ptr); p->m_FreeFunc(p); } } @@ -112,7 +112,7 @@ int32_t CCodec_GifModule::ReadHeader(void* pContext, if (setjmp(p->gif_ptr->jmpbuf)) { return 0; } - int32_t ret = _gif_read_header(p->gif_ptr); + int32_t ret = gif_read_header(p->gif_ptr); if (ret != 1) { return ret; } @@ -130,11 +130,11 @@ int32_t CCodec_GifModule::LoadFrameInfo(void* pContext, int* frame_num) { if (setjmp(p->gif_ptr->jmpbuf)) { return 0; } - int32_t ret = _gif_get_frame(p->gif_ptr); + int32_t ret = gif_get_frame(p->gif_ptr); if (ret != 1) { return ret; } - *frame_num = _gif_get_frame_num(p->gif_ptr); + *frame_num = gif_get_frame_num(p->gif_ptr); return 1; } int32_t CCodec_GifModule::LoadFrame(void* pContext, @@ -144,7 +144,7 @@ int32_t CCodec_GifModule::LoadFrame(void* pContext, if (setjmp(p->gif_ptr->jmpbuf)) { return 0; } - int32_t ret = _gif_load_frame(p->gif_ptr, frame_num); + int32_t ret = gif_load_frame(p->gif_ptr, frame_num); if (ret == 1) { if (pAttribute) { pAttribute->m_nGifLeft = @@ -177,11 +177,11 @@ int32_t CCodec_GifModule::LoadFrame(void* pContext, FX_DWORD CCodec_GifModule::GetAvailInput(void* pContext, uint8_t** avial_buf_ptr) { FXGIF_Context* p = (FXGIF_Context*)pContext; - return _gif_get_avail_input(p->gif_ptr, avial_buf_ptr); + return gif_get_avail_input(p->gif_ptr, avial_buf_ptr); } void CCodec_GifModule::Input(void* pContext, const uint8_t* src_buf, FX_DWORD src_size) { FXGIF_Context* p = (FXGIF_Context*)pContext; - _gif_input_buffer(p->gif_ptr, (uint8_t*)src_buf, src_size); + gif_input_buffer(p->gif_ptr, (uint8_t*)src_buf, src_size); } -- cgit v1.2.3