diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 15:59:14 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 15:59:14 +0000 |
| commit | 5e78d72ef2a60a625f29b45f1380ab13575057ee (patch) | |
| tree | c1120496de5f835d726763da7b1f42395cc6628f /libopenjpeg/j2k.c | |
| parent | 5c303e2bb579dfe95b4566f1249df3f51cae898f (diff) | |
rename j2k_read_siz_v2 to opj_j2k_read_siz
Diffstat (limited to 'libopenjpeg/j2k.c')
| -rw-r--r-- | libopenjpeg/j2k.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index bf353d02..62607ba4 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -429,12 +429,10 @@ static opj_bool j2k_write_siz_v2( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the SIZ marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_siz_v2 ( - opj_j2k_v2_t *p_j2k, - OPJ_BYTE * p_header_data, - OPJ_UINT32 p_header_size, - struct opj_event_mgr * p_manager - ); +static opj_bool opj_j2k_read_siz(opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager); /** Write the COM marker (comment) @@ -1456,7 +1454,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] = {J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcd_v2}, {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc_v2}, {J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_poc_v2}, - {J2K_MS_SIZ, J2K_STATE_MHSIZ , j2k_read_siz_v2}, + {J2K_MS_SIZ, J2K_STATE_MHSIZ , opj_j2k_read_siz}, {J2K_MS_TLM, J2K_STATE_MH, j2k_read_tlm_v2}, {J2K_MS_PLM, J2K_STATE_MH, j2k_read_plm_v2}, {J2K_MS_PLT, J2K_STATE_TPH, j2k_read_plt_v2}, @@ -2278,12 +2276,11 @@ opj_bool j2k_write_siz_v2( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the SIZ marker. * @param p_manager the user event manager. */ -opj_bool j2k_read_siz_v2 ( - opj_j2k_v2_t *p_j2k, - OPJ_BYTE * p_header_data, - OPJ_UINT32 p_header_size, - struct opj_event_mgr * p_manager - ) +static opj_bool opj_j2k_read_siz(opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager + ) { OPJ_UINT32 l_size, i; OPJ_UINT32 l_nb_comp; |