From: Mickael Savinaud Date: Fri, 10 Aug 2012 07:42:41 +0000 (+0000) Subject: remove deprecated v1 style function j2k_read_com X-Git-Tag: version.2.0~314 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5eb8a44317fb305b69d1a3a98ef427ffa8b68cfd;p=openjpeg remove deprecated v1 style function j2k_read_com --- diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 7c9ea4d9..c71edf56 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -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_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) * @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; } -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) * @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_SOP, 0, 0}, /*{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 {J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc},