diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-10 07:32:57 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-10 07:32:57 +0000 |
| commit | 36b5109387ace134b3e01e7c9855ea08e57a97be (patch) | |
| tree | c7d8c5261d148a6870a5a404d6cd95e567fff6c6 | |
| parent | c07b085c8122096500d2e3d190268dc801c3ae3f (diff) | |
rename j2k_read_ppt_v2 to opj_j2k_read_ppt
| -rw-r--r-- | libopenjpeg/j2k.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 5003c5b6..4a7320d1 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -810,12 +810,10 @@ static opj_bool j2k_read_ppm_v3 ( * @param p_header_size the size of the data contained in the PPT marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_ppt_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_ppt ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager ); /** Write the TLM marker (Mainheader) @param j2k J2K handle @@ -1377,7 +1375,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] = {J2K_MS_PLM, J2K_STATE_MH, opj_j2k_read_plm}, {J2K_MS_PLT, J2K_STATE_TPH, opj_j2k_read_plt}, {J2K_MS_PPM, J2K_STATE_MH, j2k_read_ppm_v3}, - {J2K_MS_PPT, J2K_STATE_TPH, j2k_read_ppt_v2}, + {J2K_MS_PPT, J2K_STATE_TPH, opj_j2k_read_ppt}, {J2K_MS_SOP, 0, 0}, {J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg_v2}, {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com_v2}, @@ -4261,10 +4259,11 @@ opj_bool j2k_read_ppm_v3 ( * @param p_header_size the size of the data contained in the PPT marker. * @param p_manager the user event manager. */ -opj_bool j2k_read_ppt_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_ppt ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager + ) { opj_cp_v2_t *l_cp = 00; opj_tcp_v2_t *l_tcp = 00; |