diff options
| -rw-r--r-- | libopenjpeg/j2k.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index fa971f75..2dabc120 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -738,12 +738,10 @@ static opj_bool j2k_read_crg_v2 ( * @param p_header_size the size of the data contained in the TLM marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_tlm_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_tlm ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager); /** * Writes the updated tlm. @@ -1399,8 +1397,8 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] = {J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_qcd}, {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_qcc}, {J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_poc}, - {J2K_MS_SIZ, J2K_STATE_MHSIZ , opj_j2k_read_siz}, - {J2K_MS_TLM, J2K_STATE_MH, j2k_read_tlm_v2}, + {J2K_MS_SIZ, J2K_STATE_MHSIZ, opj_j2k_read_siz}, + {J2K_MS_TLM, J2K_STATE_MH, opj_j2k_read_tlm}, {J2K_MS_PLM, J2K_STATE_MH, j2k_read_plm_v2}, {J2K_MS_PLT, J2K_STATE_TPH, j2k_read_plt_v2}, {J2K_MS_PPM, J2K_STATE_MH, j2k_read_ppm_v3}, @@ -3857,12 +3855,11 @@ opj_bool j2k_read_crg_v2 ( * @param p_header_size the size of the data contained in the TLM marker. * @param p_manager the user event manager. */ -opj_bool j2k_read_tlm_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_tlm ( 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_Ztlm, l_Stlm, l_ST, l_SP, l_tot_num_tp, l_tot_num_tp_remaining, l_quotient, l_Ptlm_size; /* preconditions */ |