diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-10 11:00:40 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-10 11:00:40 +0000 |
| commit | bf2b9ea5390dd66735fc779e89629cf9065d0230 (patch) | |
| tree | 0f6f4c2ec111c34c35ee02e6816e26064e928279 | |
| parent | b0b46c331e1f629e381d924ac2121ba95cc480d9 (diff) | |
rename jp2_read_boxhdr_v2 to opj_jp2_read_boxhdr
| -rw-r--r-- | libopenjpeg/jp2.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 78d29cf5..1c7205b6 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -342,12 +342,10 @@ static opj_bool opj_jp2_exec ( opj_jp2_v2_t * jp2, * * @return true if the box is reconized, false otherwise */ -static opj_bool jp2_read_boxhdr_v2( - opj_jp2_box_t *box, - OPJ_UINT32 * p_number_bytes_read, - struct opj_stream_private *cio, - struct opj_event_mgr * p_manager - ); +static opj_bool opj_jp2_read_boxhdr(opj_jp2_box_t *box, + OPJ_UINT32 * p_number_bytes_read, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager); /** * Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters @@ -452,7 +450,11 @@ static void opj_jp2_setup_header_reading (opj_jp2_v2_t *jp2); * * @return true if the box is reconized, false otherwise */ -opj_bool jp2_read_boxhdr_v2(opj_jp2_box_t *box, OPJ_UINT32 * p_number_bytes_read, opj_stream_private_t *cio, opj_event_mgr_t * p_manager) + opj_bool opj_jp2_read_boxhdr(opj_jp2_box_t *box, + OPJ_UINT32 * p_number_bytes_read, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager + ) { /* read header from file */ unsigned char l_data_header [8]; @@ -2067,7 +2069,7 @@ static opj_bool opj_jp2_read_header_procedure( opj_jp2_v2_t *jp2, } memset(l_current_data, 0 , l_last_data_size); - while (jp2_read_boxhdr_v2(&box,&l_nb_bytes_read,stream,p_manager)) { + while (opj_jp2_read_boxhdr(&box,&l_nb_bytes_read,stream,p_manager)) { /* is it the codestream box ? */ if (box.type == JP2_JP2C) { if (jp2->jp2_state & JP2_STATE_HEADER) { |