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

remove deprecated v1 style function j2k_read_com

This commit is contained in:
Mickael Savinaud 2012-08-10 07:42:41 +00:00
parent c89fb0b828
commit 5eb8a44317
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libopenjpeg/j2k.c
View File

@ -453,11 +453,6 @@ static opj_bool j2k_write_com_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 COM marker (comment)
@param j2k J2K handle
*/
static void j2k_read_com(opj_j2k_t *j2k);
/** /**
* Reads a COM marker (comments) * Reads a COM marker (comments)
* @param p_header_data the data contained in the COM box. * @param p_header_data the data contained in the COM box.
@ -2578,14 +2573,6 @@ opj_bool j2k_write_com_v2( opj_j2k_v2_t *p_j2k,
return OPJ_TRUE; return OPJ_TRUE;
} }
static void j2k_read_com(opj_j2k_t *j2k) {
int len;
opj_cio_t *cio = j2k->cio;
len = cio_read(cio, 2);
cio_skip(cio, len - 2);
}
/** /**
* Reads a COM marker (comments) * Reads a COM marker (comments)
* @param p_header_data the data contained in the COM box. * @param p_header_data the data contained in the COM box.
@ -5657,7 +5644,7 @@ opj_dec_mstabent_t j2k_dec_mstab[] = {
/*{J2K_MS_PPT, J2K_STATE_TPH, j2k_read_ppt},*/ /*{J2K_MS_PPT, J2K_STATE_TPH, j2k_read_ppt},*/
{J2K_MS_SOP, 0, 0}, {J2K_MS_SOP, 0, 0},
/*{J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg},*/ /*{J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg},*/
{J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com}, /*{J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com},*/
#ifdef USE_JPWL #ifdef USE_JPWL
{J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc}, {J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc},