diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-10 07:54:33 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-10 07:54:33 +0000 |
| commit | 706371e24f20e92d5894bb9bb8763e2ea54afb6f (patch) | |
| tree | 27f713d0454fbdb100a1d317b588b55404dced87 /libopenjpeg | |
| parent | 5de86396854269e8d123c70f6b282f597cff288c (diff) | |
rename j2k_read_cbd to opj_j2k_read_cbd
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/j2k.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 286f9e53..b5ce8dd9 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -1151,10 +1151,10 @@ static opj_bool j2k_write_cbd( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the CBD marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_cbd ( 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_cbd ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager); /** * Writes the image components. @@ -1361,7 +1361,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] = {J2K_MS_CRG, J2K_STATE_MH, opj_j2k_read_crg}, {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_CBD, J2K_STATE_MH , opj_j2k_read_cbd}, {J2K_MS_MCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mcc}, {J2K_MS_MCO, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mco}, #ifdef USE_JPWL @@ -6526,10 +6526,11 @@ opj_bool j2k_write_cbd( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the CBD marker. * @param p_manager the user event manager. */ -opj_bool j2k_read_cbd ( 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_cbd ( 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_nb_comp,l_num_comp; OPJ_UINT32 l_comp_def; |