diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 15:44:55 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 15:44:55 +0000 |
| commit | 4c1cb388af41ad54282536b5a6c96f467063d62d (patch) | |
| tree | 214274ad52abb0d3282cb78ebfad76ef5a7fe49e /libopenjpeg/j2k.c | |
| parent | 144bd4a87831137764e8c4c07fc0bbcf6f38bb73 (diff) | |
rename j2k_read_sod_v2 to opj_j2k_read_sod
Diffstat (limited to 'libopenjpeg/j2k.c')
| -rw-r--r-- | libopenjpeg/j2k.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index ff109998..a54f9b7e 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -977,11 +977,9 @@ static opj_bool j2k_write_sod_v2( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the SOD marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_sod_v2 ( - opj_j2k_v2_t *p_j2k, - struct opj_stream_private *p_stream, - struct opj_event_mgr * p_manager - ); +static opj_bool opj_j2k_read_sod( opj_j2k_v2_t *p_j2k, + opj_stream_private_t *p_stream, + opj_event_mgr_t * p_manager ); /** * Updates the Tile Length Marker. @@ -5594,11 +5592,10 @@ opj_bool j2k_write_sod_v2( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the SOD marker. * @param p_manager the user event manager. */ -opj_bool j2k_read_sod_v2 ( - opj_j2k_v2_t *p_j2k, - struct opj_stream_private *p_stream, - struct opj_event_mgr * p_manager - ) +opj_bool opj_j2k_read_sod (opj_j2k_v2_t *p_j2k, + opj_stream_private_t *p_stream, + opj_event_mgr_t * p_manager + ) { OPJ_UINT32 l_current_read_size; opj_codestream_index_t * l_cstr_index = 00; @@ -9602,7 +9599,7 @@ opj_bool j2k_read_tile_header( opj_j2k_v2_t * p_j2k, /* If we didn't skip data before, we need to read the SOD marker*/ if (! p_j2k->m_specific_param.m_decoder.m_skip_data) { /* Try to read the SOD marker and skip data ? FIXME */ - if (! j2k_read_sod_v2(p_j2k, p_stream, p_manager)) { + if (! opj_j2k_read_sod(p_j2k, p_stream, p_manager)) { return OPJ_FALSE; } |