diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-10 07:44:47 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-10 07:44:47 +0000 |
| commit | 6ea06e87bb792085fc4156fd97bb122afcf6c78f (patch) | |
| tree | 2ecc33572e698a93f0242b47460ad29a9a78261f /libopenjpeg/j2k.c | |
| parent | 5eb8a44317fb305b69d1a3a98ef427ffa8b68cfd (diff) | |
rename j2k_read_com_v2 to opj_j2k_read_com
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 c71edf56..6fde81bb 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -460,12 +460,10 @@ static opj_bool j2k_write_com_v2( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the COM marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_com_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_com ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager ); /** Write the value concerning the specified component in the marker COD and COC @param j2k J2K handle @@ -1366,7 +1364,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] = {J2K_MS_PPT, J2K_STATE_TPH, opj_j2k_read_ppt}, {J2K_MS_SOP, 0, 0}, {J2K_MS_CRG, J2K_STATE_MH, opj_j2k_read_crg}, - {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com_v2}, + {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_com}, {J2K_MS_MCT, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mct}, {J2K_MS_CBD, J2K_STATE_MH , j2k_read_cbd}, {J2K_MS_MCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mcc}, @@ -2580,12 +2578,11 @@ opj_bool j2k_write_com_v2( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the COM marker. * @param p_manager the user event manager. */ -opj_bool j2k_read_com_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_com ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager + ) { /* preconditions */ assert(p_j2k != 00); |