diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 16:57:45 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 16:57:45 +0000 |
| commit | 93cb76a292ef2789f1f44267f4e2fa26f495c15e (patch) | |
| tree | eeb6e4ad1e411c3265a532023298d539588aa11c | |
| parent | 6191f69f0cac60e1d08e585630b0622ef825a069 (diff) | |
rename j2k_read_poc_v2 to opj_j2k_read_poc
| -rw-r--r-- | libopenjpeg/j2k.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 8f098d58..dedf73df 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -706,12 +706,10 @@ static OPJ_UINT32 j2k_get_specific_header_sizes(opj_j2k_v2_t *p_j2k); * @param p_header_size the size of the data contained in the POC marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_poc_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_poc ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager ); /** Read the CRG marker (component registration) @@ -1405,7 +1403,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] = {J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_rgn}, {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, j2k_read_poc_v2}, + {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_PLM, J2K_STATE_MH, j2k_read_plm_v2}, @@ -3729,11 +3727,11 @@ OPJ_UINT32 j2k_get_specific_header_sizes(opj_j2k_v2_t *p_j2k) * @param p_header_size the size of the data contained in the POC marker. * @param p_manager the user event manager. */ -opj_bool j2k_read_poc_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_poc ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager + ) { OPJ_UINT32 i, l_nb_comp, l_tmp; opj_image_t * l_image = 00; |