diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 15:32:18 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 15:32:18 +0000 |
| commit | 6a8aff5a74b1edcf8abeb3621d3af902cc28401e (patch) | |
| tree | 48d8bb471c8e9661cfa4d33747f8501dbefa7021 /libopenjpeg/j2k.c | |
| parent | c0ec5d404bfc8f065f4214864a760c4c58ccd3c3 (diff) | |
rename j2k_read_soc_v2 to opj_j2k_read_soc
Diffstat (limited to 'libopenjpeg/j2k.c')
| -rw-r--r-- | libopenjpeg/j2k.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 4f03a965..7e7aa3ce 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -399,7 +399,7 @@ static opj_bool j2k_write_soc_v2( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the SOC marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_soc_v2( +static opj_bool opj_j2k_read_soc( opj_j2k_v2_t *p_j2k, struct opj_stream_private *p_stream, struct opj_event_mgr * p_manager @@ -2118,7 +2118,7 @@ opj_bool j2k_write_soc_v2( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the SOC marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_soc_v2( opj_j2k_v2_t *p_j2k, +static opj_bool opj_j2k_read_soc( opj_j2k_v2_t *p_j2k, struct opj_stream_private *p_stream, struct opj_event_mgr * p_manager ) { @@ -9140,7 +9140,7 @@ opj_bool j2k_read_header_procedure( opj_j2k_v2_t *p_j2k, p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_MHSOC; /* Try to read the SOC marker, the codestream must begin with SOC marker */ - if (! j2k_read_soc_v2(p_j2k,p_stream,p_manager)) { + if (! opj_j2k_read_soc(p_j2k,p_stream,p_manager)) { opj_event_msg_v2(p_manager, EVT_ERROR, "Expected a SOC marker \n"); return OPJ_FALSE; } |