walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

rename j2k_read_sod_v2 to opj_j2k_read_sod

This commit is contained in:
Mickael Savinaud 2012-08-09 15:44:55 +00:00
parent 144bd4a878
commit 4c1cb388af
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libopenjpeg/j2k.c
View File

@ -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_header_size the size of the data contained in the SOD marker.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
static opj_bool j2k_read_sod_v2 ( static opj_bool opj_j2k_read_sod( opj_j2k_v2_t *p_j2k,
opj_j2k_v2_t *p_j2k, opj_stream_private_t *p_stream,
struct opj_stream_private *p_stream, opj_event_mgr_t * p_manager );
struct opj_event_mgr * p_manager
);
/** /**
* Updates the Tile Length Marker. * 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_header_size the size of the data contained in the SOD marker.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
opj_bool j2k_read_sod_v2 ( opj_bool opj_j2k_read_sod (opj_j2k_v2_t *p_j2k,
opj_j2k_v2_t *p_j2k, opj_stream_private_t *p_stream,
struct opj_stream_private *p_stream, opj_event_mgr_t * p_manager
struct opj_event_mgr * p_manager )
)
{ {
OPJ_UINT32 l_current_read_size; OPJ_UINT32 l_current_read_size;
opj_codestream_index_t * l_cstr_index = 00; 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 we didn't skip data before, we need to read the SOD marker*/
if (! p_j2k->m_specific_param.m_decoder.m_skip_data) { if (! p_j2k->m_specific_param.m_decoder.m_skip_data) {
/* Try to read the SOD marker and skip data ? FIXME */ /* 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; return OPJ_FALSE;
} }