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

remove deprecated v1 style function j2k_read_soc

This commit is contained in:
Mickael Savinaud 2012-08-09 15:28:38 +00:00
parent 10e9a6b6cd
commit c0ec5d404b
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libopenjpeg/j2k.c
View File

@ -392,12 +392,6 @@ static opj_bool j2k_write_soc_v2( opj_j2k_v2_t *p_j2k,
struct opj_stream_private *p_stream, struct opj_stream_private *p_stream,
struct opj_event_mgr * p_manager ); struct opj_event_mgr * p_manager );
/**
Read the SOC marker (Start of Codestream)
@param j2k J2K handle
*/
static void j2k_read_soc(opj_j2k_t *j2k);
/** /**
* Reads a SOC marker (Start of Codestream) * Reads a SOC marker (Start of Codestream)
* @param p_header_data the data contained in the SOC box. * @param p_header_data the data contained in the SOC box.
@ -2115,14 +2109,7 @@ opj_bool j2k_write_soc_v2( opj_j2k_v2_t *p_j2k,
return OPJ_TRUE; return OPJ_TRUE;
} }
static void j2k_read_soc(opj_j2k_t *j2k) {
j2k->state = J2K_STATE_MHSIZ;
/* Index */
if (j2k->cstr_info) {
j2k->cstr_info->main_head_start = cio_tell(j2k->cio) - 2;
j2k->cstr_info->codestream_size = cio_numbytesleft(j2k->cio) + 2 - j2k->cstr_info->main_head_start;
}
}
/** /**
* Reads a SOC marker (Start of Codestream) * Reads a SOC marker (Start of Codestream)
@ -6609,7 +6596,7 @@ typedef struct opj_dec_mstabent {
} opj_dec_mstabent_t; } opj_dec_mstabent_t;
opj_dec_mstabent_t j2k_dec_mstab[] = { opj_dec_mstabent_t j2k_dec_mstab[] = {
{J2K_MS_SOC, J2K_STATE_MHSOC, j2k_read_soc}, /*{J2K_MS_SOC, J2K_STATE_MHSOC, j2k_read_soc},*/
{J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, j2k_read_sot}, {J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, j2k_read_sot},
{J2K_MS_SOD, J2K_STATE_TPH, j2k_read_sod}, {J2K_MS_SOD, J2K_STATE_TPH, j2k_read_sod},
{J2K_MS_EOC, J2K_STATE_TPHSOT, j2k_read_eoc}, {J2K_MS_EOC, J2K_STATE_TPHSOT, j2k_read_eoc},