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

[trunk] Remove deprecated functions. 

Update issue 268
This commit is contained in:
Mathieu Malaterre 2014-03-03 08:30:36 +00:00
parent d14c475de7
commit 3c7a7a1675
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/openjp2/jp2.c
View File

@ -2712,6 +2712,7 @@ static OPJ_BOOL opj_jpip_write_cidx(opj_jp2_t *jp2,
return OPJ_TRUE; return OPJ_TRUE;
} }
#if 0
static void write_prxy( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio, static void write_prxy( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio,
opj_event_mgr_t * p_manager ) opj_event_mgr_t * p_manager )
{ {
@ -2744,8 +2745,10 @@ static void write_prxy( int offset_jp2c, int length_jp2c, int offset_idx, int le
opj_stream_write_data(cio,l_data_header,4,p_manager); opj_stream_write_data(cio,l_data_header,4,p_manager);
opj_stream_seek(cio, lenp+len,p_manager); opj_stream_seek(cio, lenp+len,p_manager);
} }
#endif
#if 0
static int write_fidx( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio, static int write_fidx( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio,
opj_event_mgr_t * p_manager ) opj_event_mgr_t * p_manager )
{ {
@ -2767,4 +2770,5 @@ static int write_fidx( int offset_jp2c, int length_jp2c, int offset_idx, int len
return len; return len;
} }
#endif
#endif /* USE_JPIP */ #endif /* USE_JPIP */

9
src/lib/openjp2/t1.c
View File

@ -62,6 +62,7 @@ static void opj_t1_enc_sigpass_step(opj_t1_t *t1,
/** /**
Decode significant pass Decode significant pass
*/ */
#if 0
static void opj_t1_dec_sigpass_step(opj_t1_t *t1, static void opj_t1_dec_sigpass_step(opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
@ -69,6 +70,7 @@ static void opj_t1_dec_sigpass_step(opj_t1_t *t1,
OPJ_INT32 oneplushalf, OPJ_INT32 oneplushalf,
OPJ_BYTE type, OPJ_BYTE type,
OPJ_UINT32 vsc); OPJ_UINT32 vsc);
#endif
static INLINE void opj_t1_dec_sigpass_step_raw( static INLINE void opj_t1_dec_sigpass_step_raw(
opj_t1_t *t1, opj_t1_t *t1,
@ -161,6 +163,7 @@ static void opj_t1_dec_refpass_mqc_vsc(
/** /**
Decode refinement pass Decode refinement pass
*/ */
#if 0
static void opj_t1_dec_refpass_step(opj_t1_t *t1, static void opj_t1_dec_refpass_step(opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
@ -168,6 +171,7 @@ static void opj_t1_dec_refpass_step(opj_t1_t *t1,
OPJ_INT32 neghalf, OPJ_INT32 neghalf,
OPJ_BYTE type, OPJ_BYTE type,
OPJ_UINT32 vsc); OPJ_UINT32 vsc);
#endif
static INLINE void opj_t1_dec_refpass_step_raw( static INLINE void opj_t1_dec_refpass_step_raw(
opj_t1_t *t1, opj_t1_t *t1,
@ -1678,6 +1682,7 @@ void opj_t1_encode_cblk(opj_t1_t *t1,
} }
} }
#if 0
void opj_t1_dec_refpass_step( opj_t1_t *t1, void opj_t1_dec_refpass_step( opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
@ -1705,9 +1710,11 @@ void opj_t1_dec_refpass_step( opj_t1_t *t1,
*flagsp |= T1_REFINE; *flagsp |= T1_REFINE;
} }
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
#endif
#if 0
void opj_t1_dec_sigpass_step( opj_t1_t *t1, void opj_t1_dec_sigpass_step( opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
@ -1741,4 +1748,4 @@ void opj_t1_dec_sigpass_step( opj_t1_t *t1,
*flagsp |= T1_VISIT; *flagsp |= T1_VISIT;
} }
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
#endif