Index: core/src/fxcodec/codec/fx_codec_bmp.cpp |
diff --git a/core/src/fxcodec/codec/fx_codec_bmp.cpp b/core/src/fxcodec/codec/fx_codec_bmp.cpp |
index 042392c0d1dff72639e0b9ab84ee751ceec30ebf..41a881d3ae75c1e354f795806d25613024995020 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); |
} |