[trunk] merge r1229 from branch 1.5 over to trunk

This commit is contained in:
Mathieu Malaterre 2012-03-02 15:24:12 +00:00
parent e78e2885fe
commit b9e216ac6f
1 changed files with 3 additions and 3 deletions

View File

@ -146,20 +146,20 @@ static void t1_enc_refpass_step(
/** /**
Decode refinement pass Decode refinement pass
*/ */
static void INLINE t1_dec_refpass_step_raw( static INLINE void t1_dec_refpass_step_raw(
opj_t1_t *t1, opj_t1_t *t1,
flag_t *flagsp, flag_t *flagsp,
int *datap, int *datap,
int poshalf, int poshalf,
int neghalf, int neghalf,
int vsc); int vsc);
static void INLINE t1_dec_refpass_step_mqc( static INLINE void t1_dec_refpass_step_mqc(
opj_t1_t *t1, opj_t1_t *t1,
flag_t *flagsp, flag_t *flagsp,
int *datap, int *datap,
int poshalf, int poshalf,
int neghalf); int neghalf);
static void INLINE t1_dec_refpass_step_mqc_vsc( static INLINE void t1_dec_refpass_step_mqc_vsc(
opj_t1_t *t1, opj_t1_t *t1,
flag_t *flagsp, flag_t *flagsp,
int *datap, int *datap,