From b9e216ac6f3546cb54648e7d7166c5c3ea272cfb Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Fri, 2 Mar 2012 15:24:12 +0000 Subject: [PATCH] [trunk] merge r1229 from branch 1.5 over to trunk --- libopenjpeg/t1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c index 92da1d7b..32257912 100644 --- a/libopenjpeg/t1.c +++ b/libopenjpeg/t1.c @@ -146,20 +146,20 @@ static void t1_enc_refpass_step( /** Decode refinement pass */ -static void INLINE t1_dec_refpass_step_raw( +static INLINE void t1_dec_refpass_step_raw( opj_t1_t *t1, flag_t *flagsp, int *datap, int poshalf, int neghalf, int vsc); -static void INLINE t1_dec_refpass_step_mqc( +static INLINE void t1_dec_refpass_step_mqc( opj_t1_t *t1, flag_t *flagsp, int *datap, int poshalf, int neghalf); -static void INLINE t1_dec_refpass_step_mqc_vsc( +static INLINE void t1_dec_refpass_step_mqc_vsc( opj_t1_t *t1, flag_t *flagsp, int *datap,